From: Murray <source@isc.org>
Date: Sun, 9 Jun 2002 22:49:51 +0000 (+0000)
Subject: Merge from branch - possibly avoid null-pointer dereference.
X-Git-Tag: HEAD-MERGE-V3-0-3B1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=066bd4d54758d07b1a7dc1761dd76c13ce7a3d4e;p=thirdparty%2Fdhcp.git

Merge from branch - possibly avoid null-pointer dereference.
---

diff --git a/common/discover.c b/common/discover.c
index c11abb9ce..b11bb095f 100644
--- a/common/discover.c
+++ b/common/discover.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: discover.c,v 1.44 2001/06/27 00:29:44 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: discover.c,v 1.45 2002/06/09 22:49:51 murray Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -407,8 +407,11 @@ void discover_interfaces (state)
 					   name, isc_result_totext (status));
 			tmp -> flags = ir;
 			strncpy (tmp -> name, name, IFNAMSIZ);
-			interface_reference (&tmp -> next, interfaces, MDL);
-			interface_dereference (&interfaces, MDL);
+			if (interfaces) {
+				interface_reference (&tmp -> next,
+						     interfaces, MDL);
+				interface_dereference (&interfaces, MDL);
+			}
 			interface_reference (&interfaces, tmp, MDL);
 			interface_dereference (&tmp, MDL);
 			tmp = interfaces;