Merge pull request #27 from abligh/fix-null-datagram-address

mcuadros · mcuadros · commit e75d99192244 · 2016-03-12T09:47:31.000+01:00
Fix null datagram address
diff --git a/server.go b/server.go
@@ -323,7 +323,11 @@ func (s *Server) goReceiveDatagrams(connection net.Conn) {
 				for ; (n > 0) && (buf[n-1] < 32); n-- {
 				}
 				if n > 0 {
-					s.datagramChannel <- DatagramMessage{buf[:n], addr.String()}
+					var address string
+					if addr != nil {
+						address = addr.String()
+					}
+					s.datagramChannel <- DatagramMessage{buf[:n], address}
 				}
 			} else {
 				// there has been an error. Either the server has been killed

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,11 @@ func (s *Server) goReceiveDatagrams(connection net.Conn) {`
`323`	`323`	`for ; (n > 0) && (buf[n-1] < 32); n-- {`
`324`	`324`	`}`
`325`	`325`	`if n > 0 {`
`326`		`- s.datagramChannel <- DatagramMessage{buf[:n], addr.String()}`
	`326`	`+ var address string`
	`327`	`+ if addr != nil {`
	`328`	`+ address = addr.String()`
	`329`	`+ }`
	`330`	`+ s.datagramChannel <- DatagramMessage{buf[:n], address}`
`327`	`331`	`}`
`328`	`332`	`} else {`
`329`	`333`	`// there has been an error. Either the server has been killed`