INSIST ipnum6 != NULL

diff --git a/lib/dns/geoip.c b/lib/dns/geoip.c
index c27042c604677b7b8c0c3cba9f07b45657dc4115..6abe9cfdb8e6d7ec744b3b2dfd35e76c3a088122 100644 (file)
--- 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 18f926c69fb66898e0960f2f437e334d9f64ef5a..26e997142bf2283cbed31c8f88a8fa9f068f9858 100644 (file)
--- 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