summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorinsomniacslk <insomniacslk@users.noreply.github.com>2016-03-20 16:34:20 +0000
committerinsomniacslk <insomniacslk@users.noreply.github.com>2016-03-20 16:34:20 +0000
commit75228635d9b130f6ef991d018b3f249fdc293b24 (patch)
treecd01c6a8d4db003036ff93b48eb33dba4a42b15c
parentcc6281dbe24cc3f374d359b2c1b7af28fa2d2cad (diff)
parent8e955cbe50f4712e24d8498e8219cb02f68ffa7d (diff)
downloadfbtracert-75228635d9b130f6ef991d018b3f249fdc293b24.zip
fbtracert-75228635d9b130f6ef991d018b3f249fdc293b24.tar.gz
fbtracert-75228635d9b130f6ef991d018b3f249fdc293b24.tar.bz2
Merge pull request #4 from juergenthomann/master
nil pointer dereference in resolveName
-rw-r--r--main.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/main.go b/main.go
index 30b0a13..3e2df9d 100644
--- a/main.go
+++ b/main.go
@@ -71,7 +71,10 @@ func getSourceAddr(af string, srcAddr string) (*net.IP, error) {
// Resolve given hostname/address in the given address family
func resolveName(dest string, af string) (*net.IP, error) {
addr, err := net.ResolveIPAddr(af, dest)
- return &addr.IP, err
+ if err != nil {
+ return nil, err
+ }
+ return &addr.IP, nil
}
// Probe is emitted by sender