diff options
| author | Shawn Routhier <sar@isc.org> | 2012-04-11 15:43:34 +0000 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2012-04-11 15:43:34 +0000 |
| commit | bb9189c30a948ef1b2d441dbef5b7c2435aa197d (patch) | |
| tree | 608a76a22e5e396fccf0b966fdee993e458774f5 /omapip | |
| parent | 30e7ccb0df712a6b7fca18446281ba65009896a2 (diff) | |
| download | isc-dhcp-bb9189c30a948ef1b2d441dbef5b7c2435aa197d.tar.gz | |
Fix up some issues found by static analysis
A potential memory leak and NULL dereference in omapi.
The use of a boolean test instead of a bitwise test in dst.
[ISC-Bugs #28941]
Diffstat (limited to 'omapip')
| -rw-r--r-- | omapip/protocol.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/omapip/protocol.c b/omapip/protocol.c index 1a6d7e87..99064898 100644 --- a/omapip/protocol.c +++ b/omapip/protocol.c @@ -3,7 +3,8 @@ Functions supporting the object management protocol... */ /* - * Copyright (c) 2004-2007,2009 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2009,2012 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2004-2007 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 @@ -926,12 +927,10 @@ isc_result_t omapi_protocol_destroy (omapi_object_t *h, dfree (p -> default_auth, file, line); while (p -> remote_auth_list) { - omapi_remote_auth_t *r = p -> remote_auth_list -> next; - p -> remote_auth_list = r; - if (r) { - omapi_object_dereference (&r -> a, file, line); - dfree (r, file, line); - } + omapi_remote_auth_t *r = p -> remote_auth_list; + p -> remote_auth_list = p -> remote_auth_list -> next; + omapi_object_dereference (&r -> a, file, line); + dfree (r, file, line); } return ISC_R_SUCCESS; } |