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

    Merged in rt40374.

diff --git a/RELNOTES b/RELNOTES
index 565b225ce51378462a9f2e8a564293805617eaf2..9a6ff7cd84157483b90248e8753ba482ecf502ed 100644 (file)
--- 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 bd8505ff880f9e6f91ae20a07212b6e1bb10e0ae..cd2ebbc196ebd953d869feb81680d6369fceff1f 100644 (file)
--- 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),