Merge #13776: net: Add missing verification of IPv6 address in CNetAddr::GetIn6Addr(...)

laanwj · laanwj · commit 7d3623794a10 · 2018-07-31T20:47:40.000+02:00
2fb0066 net: Add missing verification of IPv6 address in CNetAddr::GetIn6Addr(...) (practicalswift) Pull request description: Add missing verification of IPv6 address in `CNetAddr::GetIn6Addr(...)`. Tree-SHA512: 8b0681252eec9cf293a2043e99fdacec520e321b477d8aca1cbd6327b85bf6c5e8cd820fb914f097c62655947e88745ebccd824a78b995a8186e910e6fe520aa
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -300,6 +300,9 @@ bool CNetAddr::GetInAddr(struct in_addr* pipv4Addr) const
 
 bool CNetAddr::GetIn6Addr(struct in6_addr* pipv6Addr) const
 {
+    if (!IsIPv6()) {
+        return false;
+    }
     memcpy(pipv6Addr, ip, 16);
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,9 @@ bool CNetAddr::GetInAddr(struct in_addr* pipv4Addr) const`
`300`	`300`
`301`	`301`	`bool CNetAddr::GetIn6Addr(struct in6_addr* pipv6Addr) const`
`302`	`302`	`{`
	`303`	`+ if (!IsIPv6()) {`
	`304`	`+ return false;`
	`305`	`+ }`
`303`	`306`	`memcpy(pipv6Addr, ip, 16);`
`304`	`307`	`return true;`
`305`	`308`	`}`