Module Name: src
Committed By: apb
Date: Thu Feb 7 13:20:51 UTC 2013
Modified Files:
src/sbin/ifconfig: env.c
Log Message:
Avoid dereferencing NULL. Coverity CID 275201.
Also fix a typo in previous: !== should be !=
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/ifconfig/env.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/env.c
diff -u src/sbin/ifconfig/env.c:1.8 src/sbin/ifconfig/env.c:1.9
--- src/sbin/ifconfig/env.c:1.8 Thu Feb 7 11:24:15 2013
+++ src/sbin/ifconfig/env.c Thu Feb 7 13:20:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: env.c,v 1.8 2013/02/07 11:24:15 apb Exp $ */
+/* $NetBSD: env.c,v 1.9 2013/02/07 13:20:51 apb Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: env.c,v 1.8 2013/02/07 11:24:15 apb Exp $");
+__RCSID("$NetBSD: env.c,v 1.9 2013/02/07 13:20:51 apb Exp $");
#endif /* not lint */
#include <errno.h>
@@ -53,10 +53,12 @@ prop_dictionary_augment(prop_dictionary_
const char *key;
d = prop_dictionary_copy_mutable(bottom);
+ if (d == NULL)
+ return NULL;
i = prop_dictionary_iterator(top);
- while ((ko = prop_object_iterator_next(i)) != NULL) {
+ while (i != NULL && (ko = prop_object_iterator_next(i)) != NULL) {
k = (prop_dictionary_keysym_t)ko;
key = prop_dictionary_keysym_cstring_nocopy(k);
o = prop_dictionary_get_keysym(top, k);
@@ -66,8 +68,9 @@ prop_dictionary_augment(prop_dictionary_
break;
}
}
- prop_object_iterator_release(i);
- if (d !== NULL)
+ if (i != NULL)
+ prop_object_iterator_release(i);
+ if (d != NULL)
prop_dictionary_make_immutable(d);
return d;
}
