From: Mark Andrews <marka@isc.org>
Date: Thu, 23 May 2013 04:21:20 +0000 (+1000)
Subject: - Address static analysis warnings.
X-Git-Tag: v4_3_0a1~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9626483bbb45fd4175714e379e2854b012b238e5;p=thirdparty%2Fdhcp.git

- Address static analysis warnings.
  [ISC-Bugs #33510] [ISC-Bugs #33511]
---

diff --git a/RELNOTES b/RELNOTES
index cf356c4ba..ea607206a 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -61,7 +61,7 @@ work on other platforms. Please report any problems and suggested fixes to
 			Changes since 4.2.5
 
 - Address static analysis warnings.
-  [ISC-Bugs #33510]
+  [ISC-Bugs #33510] [ISC-Bugs #33511]
 
 - Silence benign static analysis warnings.
   [ISC-Bugs #33428]
diff --git a/server/omapi.c b/server/omapi.c
index 5901cc551..9a44fc0b8 100644
--- a/server/omapi.c
+++ b/server/omapi.c
@@ -3,7 +3,7 @@
    OMAPI object interfaces for the DHCP server. */
 
 /*
- * Copyright (c) 2004-2009,2012 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2009,2012,2013 by Internet Systems Consortium, Inc. ("ISC")
  * Copyright (c) 1999-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -2418,7 +2418,6 @@ isc_result_t binding_scope_set_value (struct binding_scope *scope, int createp,
 		}
 		memset (bp, 0, sizeof *bp);
 		bp -> name = nname;
-		nname = (char *)0;
 		bp -> next = scope -> bindings;
 		scope -> bindings = bp;
 	} else {
@@ -2534,6 +2533,8 @@ isc_result_t binding_scope_stuff_values (omapi_object_t *c,
 		    status = (omapi_connection_put_uint32
 			      (c,
 			       ((u_int32_t)(bp -> value -> value.boolean))));
+		    if (status != ISC_R_SUCCESS)
+			    return status;
 		    break;
 
 		  case binding_data:
@@ -2558,6 +2559,8 @@ isc_result_t binding_scope_stuff_values (omapi_object_t *c,
 		    status = (omapi_connection_put_uint32
 			      (c, ((u_int32_t)
 				   (bp -> value -> value.intval))));
+		    if (status != ISC_R_SUCCESS)
+			    return status;
 		    break;