From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 8 Sep 2015 19:06:03 +0000 (-0400)
Subject: [master] Corrected static analysis issue in common/execute.c
X-Git-Tag: v4_3_4~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7da1ac2bc68d6e65ee240d3f98a9ed67483db804;p=thirdparty%2Fdhcp.git

[master] Corrected static analysis issue in common/execute.c

    Merged in rt40374.
---

diff --git a/RELNOTES b/RELNOTES
index 565b225ce..9a6ff7cd8 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -52,8 +52,12 @@ ISC DHCP is open source software maintained by Internet Systems
 Consortium.  This product includes cryptographic software written
 by Eric Young (eay@cryptsoft.com).
 
-			Changes since 4.3.3b1
+			Changes since 4.3.3
+
+- Corrected a static analyzer warning in common/execute.c
+  [ISC-Bugs #40374]
 
+			Changes since 4.3.3b1
 - None
 
 			Changes since 4.3.2
diff --git a/common/execute.c b/common/execute.c
index bd8505ff8..cd2ebbc19 100644
--- a/common/execute.c
+++ b/common/execute.c
@@ -441,11 +441,11 @@ int execute_statements (result, packet, lease, client_state,
 		      next_let:
 			if (ns) {
 				binding = dmalloc(sizeof(*binding), MDL);
-				memset(binding, 0, sizeof(*binding));
 				if (!binding) {
 				   blb:
 				    binding_scope_dereference(&ns, MDL);
 				} else {
+				    memset(binding, 0, sizeof(*binding));
 				    binding->name =
 					    dmalloc(strlen
 						    (e->data.let.name + 1),