From: Mark Andrews <marka@isc.org>
Date: Wed, 14 Feb 2018 08:31:16 +0000 (+1100)
Subject: INSIST ipnum6 != NULL
X-Git-Tag: v9.13.0~155^2~3^2~46
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7d375efaeae5f4a85185290711867d2af306f219;p=thirdparty%2Fbind9.git

INSIST ipnum6 != NULL
---

diff --git a/lib/dns/geoip.c b/lib/dns/geoip.c
index c27042c6046..6abe9cfdb8e 100644
--- a/lib/dns/geoip.c
+++ b/lib/dns/geoip.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -189,10 +189,12 @@ set_state(unsigned int family, isc_uint32_t ipnum, const geoipv6_t *ipnum6,
 	clean_state(state);
 #endif
 
-	if (family == AF_INET)
+	if (family == AF_INET) {
 		state->ipnum = ipnum;
-	else
+	} else {
+		INSIST(ipnum6 != NULL);
 		state->ipnum6 = *ipnum6;
+	}
 
 	state->family = family;
 	state->subtype = subtype;
diff --git a/util/copyrights b/util/copyrights
index 18f926c69fb..26e997142bf 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -3336,7 +3336,7 @@
 ./lib/dns/gen-unix.h				C	1999,2000,2001,2004,2005,2007,2009,2016
 ./lib/dns/gen-win32.h				C	1999,2000,2001,2004,2005,2006,2007,2009,2014,2016
 ./lib/dns/gen.c					C	1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2012,2013,2014,2015,2016,2017
-./lib/dns/geoip.c				C	2013,2014,2015,2016
+./lib/dns/geoip.c				C	2013,2014,2015,2016,2018
 ./lib/dns/gssapi_link.c				C	2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016
 ./lib/dns/gssapictx.c				C	2000,2001,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
 ./lib/dns/hmac_link.c				C.NAI	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018