r13975: Re-fix Coverity #156 - I had left the hidden arg. inconsistent

between Realloc and realloc_array.
Jeremy.

diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h
index 6c9ab017ba6e243d729f84e66185decc1b283a25..3ae8814cfd32cde554609f5c6379093c540def59 100644 (file)
--- a/source/include/smb_macros.h
+++ b/source/include/smb_macros.h
@@ -274,7 +274,7 @@ copy an IP address from one buffer to another
 #define SMB_REALLOC(p,s) Realloc((p),(s),True) /* Always frees p on error or s == 0 */
 #define SMB_REALLOC_KEEP_OLD_ON_ERROR(p,s) Realloc((p),(s),False) /* Never frees p on error or s == 0 */
 #define SMB_REALLOC_ARRAY(p,type,count) (type *)realloc_array((p),sizeof(type),(count),True) /* Always frees p on error or s == 0 */
-#define SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(p,type,count) (type *)realloc_array((p),sizeof(type),(count),False) /* Always frees p on error or s == 0 */
+#define SMB_REALLOC_ARRAY_KEEP_OLD_ON_ERROR(p,type,count) (type *)realloc_array((p),sizeof(type),(count),False) /* Never frees p on error or s == 0 */
 #define SMB_CALLOC_ARRAY(type,count) (type *)calloc_array(sizeof(type),(count))
 #define SMB_XMALLOC_P(type) (type *)smb_xmalloc_array(sizeof(type),1)
 #define SMB_XMALLOC_ARRAY(type,count) (type *)smb_xmalloc_array(sizeof(type),(count))

diff --git a/source/lib/util.c b/source/lib/util.c
index 758ebfd27dda4775d18c23084f56c9ef21d8f3ae..6e0a7c0e2f9dae733fdbde91c8df65a758fbc763 100644 (file)
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -1009,15 +1009,15 @@ void *Realloc(void *p, size_t size, BOOL free_old_on_error)
  Type-safe realloc.
 ****************************************************************************/
 
-void *realloc_array(void *p, size_t el_size, unsigned int count, BOOL keep_old_on_error)
+void *realloc_array(void *p, size_t el_size, unsigned int count, BOOL free_old_on_error)
 {
        if (count >= MAX_ALLOC_SIZE/el_size) {
-               if (!keep_old_on_error) {
+               if (free_old_on_error) {
                        SAFE_FREE(p);
                }
                return NULL;
        }
-       return Realloc(p, el_size*count, keep_old_on_error);
+       return Realloc(p, el_size*count, free_old_on_error);
 }
 
 /****************************************************************************

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index f1ae9a472a54ab2c83e58063a062185d3bc52916..446a4a00a1916e3ac9ae1fea71a6061fa972bf6e 100644 (file)
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -1779,8 +1779,9 @@ BOOL str_list_copy(char ***dest, const char **src)
                                DEBUG(0,("str_list_copy: Unable to re-allocate memory"));
                                str_list_free(&list);
                                return False;
-                       } else
+                       } else {
                                list = rlist;
+                       }
                        memset (&list[num], 0, ((sizeof(char **)) * (S_LIST_ABS +1)));
                }