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

    Merged in rt40374.

diff --git a/RELNOTES b/RELNOTES
index 9383f4753ef9cf3fe4d72ff96b2995cfb1fd7b12..8fa810a8c5186afa712de1054cb1a64ab1914e15 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -58,8 +58,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.1-ESV-R12b1
+                       Changes since 4.1-ESV-R12
+
+- Corrected a static analyzer warning in common/execute.c
+  [ISC-Bugs #40374]
 
+                       Changes since 4.1-ESV-R12b1
 - None
 
                        Changes since 4.1-ESV-R11

diff --git a/common/execute.c b/common/execute.c
index d0313929dee2d52053d638c6bd4d69fe8aef42c5..aa67ad447f1b69ace1e740eab5dedd46a295ff07 100644 (file)
--- a/common/execute.c
+++ b/common/execute.c
@@ -429,11 +429,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),