svn commit: samba r24759 - in branches: SAMBA_3_2/source/include SAMBA_3_2/source/lib SAMBA_3_2/source/libaddns SAMBA_3_2/source/rpc_parse SAMBA_3_2_0/source/include SAMBA_3_2_0/source/lib SAMBA_3_2_0/source/libaddns SAMBA_3_2_0/source/rpc_parse

[jra at samba.org]

Author: jra
Date: 2007-08-29 01:23:31 +0000 (Wed, 29 Aug 2007)
New Revision: 24759

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24759

Log:
Comment out the _nonnull calls for 3.2.x, as agreed with tridge.
Leaving the commented out code for now, in case I need to re-test
some stuff.
Jeremy

Modified:
   branches/SAMBA_3_2/source/include/smb_macros.h
   branches/SAMBA_3_2/source/lib/util.c
   branches/SAMBA_3_2/source/libaddns/dns.h
   branches/SAMBA_3_2/source/rpc_parse/parse_prs.c
   branches/SAMBA_3_2_0/source/include/smb_macros.h
   branches/SAMBA_3_2_0/source/lib/util.c
   branches/SAMBA_3_2_0/source/libaddns/dns.h
   branches/SAMBA_3_2_0/source/rpc_parse/parse_prs.c


Changeset:
Modified: branches/SAMBA_3_2/source/include/smb_macros.h
===================================================================
--- branches/SAMBA_3_2/source/include/smb_macros.h	2007-08-29 00:56:13 UTC (rev 24758)
+++ branches/SAMBA_3_2/source/include/smb_macros.h	2007-08-29 01:23:31 UTC (rev 24759)
@@ -275,6 +275,11 @@
 
 /* The new talloc is paranoid malloc checker safe. */
 
+#if 0
+
+Disable these now we've checked all code paths and ensured
+NULL returns on zero request. JRA.
+
 #define TALLOC(ctx, size) talloc_zeronull(ctx, size, __location__)
 #define TALLOC_P(ctx, type) (type *)talloc_zeronull(ctx, sizeof(type), #type)
 #define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array_zeronull(ctx, sizeof(type), count, #type)
@@ -282,12 +287,27 @@
 #define TALLOC_ZERO(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
 #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero_zeronull(ctx, sizeof(type), #type)
 #define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array_zeronull(ctx, sizeof(type), count, #type)
+#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__)
+#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
+
+#else
+
+#define TALLOC(ctx, size) talloc_named_const(ctx, size, __location__)
+#define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type)
+#define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array(ctx, sizeof(type), count, #type)
+#define TALLOC_MEMDUP(ctx, ptr, size) _talloc_memdup(ctx, ptr, size, __location__)
+#define TALLOC_ZERO(ctx, size) _talloc_zero(ctx, size, __location__)
+#define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
+#define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type)
+#define TALLOC_SIZE(ctx, size) talloc(ctx, size, __location__)
+#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero(ctx, size, __location__)
+
+#endif
+
 #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, __location__)
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
 #define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
-#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__)
-#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
 
 /* only define PARANOID_MALLOC_CHECKER with --enable-developer and not compiling
    the smbmount utils */

Modified: branches/SAMBA_3_2/source/lib/util.c
===================================================================
--- branches/SAMBA_3_2/source/lib/util.c	2007-08-29 00:56:13 UTC (rev 24758)
+++ branches/SAMBA_3_2/source/lib/util.c	2007-08-29 01:23:31 UTC (rev 24759)
@@ -3314,6 +3314,11 @@
 	return IVAL(ptr,off);
 }
 
+#if 0
+
+Disable these now we've checked all code paths and ensured
+NULL returns on zero request. JRA.
+
 /****************************************************************
  talloc wrapper functions that guarentee a null pointer return
  if size == 0.
@@ -3412,3 +3417,4 @@
 	}
 	return talloc_named_const(context, size, name);
 }
+#endif

Modified: branches/SAMBA_3_2/source/libaddns/dns.h
===================================================================
--- branches/SAMBA_3_2/source/libaddns/dns.h	2007-08-29 00:56:13 UTC (rev 24758)
+++ branches/SAMBA_3_2/source/libaddns/dns.h	2007-08-29 01:23:31 UTC (rev 24759)
@@ -86,6 +86,11 @@
 
 #include <talloc.h>
 
+#if 0
+
+Disable these now we've checked all code paths and ensured
+NULL returns on zero request. JRA.
+
 void *_talloc_zero_zeronull(const void *ctx, size_t size, const char *name);
 void *_talloc_memdup_zeronull(const void *t, const void *p, size_t size, const char *name);
 void *_talloc_array_zeronull(const void *ctx, size_t el_size, unsigned count, const char *name);
@@ -99,12 +104,27 @@
 #define TALLOC_ZERO(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
 #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero_zeronull(ctx, sizeof(type), #type)
 #define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array_zeronull(ctx, sizeof(type), count, #type)
+#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__)
+#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
+
+#else
+
+#define TALLOC(ctx, size) talloc_named_const(ctx, size, __location__)
+#define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type)
+#define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array(ctx, sizeof(type), count, #type)
+#define TALLOC_MEMDUP(ctx, ptr, size) _talloc_memdup(ctx, ptr, size, __location__)
+#define TALLOC_ZERO(ctx, size) _talloc_zero(ctx, size, __location__)
+#define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
+#define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type)
+#define TALLOC_SIZE(ctx, size) talloc(ctx, size, __location__)
+#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero(ctx, size, __location__)
+
+#endif
+
 #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, __location__)
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
 #define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
-#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__)
-#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
 
 /*******************************************************************
    Type definitions for int16, int32, uint16 and uint32.  Needed

Modified: branches/SAMBA_3_2/source/rpc_parse/parse_prs.c
===================================================================
--- branches/SAMBA_3_2/source/rpc_parse/parse_prs.c	2007-08-29 00:56:13 UTC (rev 24758)
+++ branches/SAMBA_3_2/source/rpc_parse/parse_prs.c	2007-08-29 01:23:31 UTC (rev 24759)
@@ -161,7 +161,7 @@
 
 	if (size && count) {
 		/* We can't call the type-safe version here. */
-		ret = (char *)_talloc_zero_array_zeronull(ps->mem_ctx, size, count,
+		ret = (char *)_talloc_zero_array(ps->mem_ctx, size, count,
 						 "parse_prs");
 	}
 	return ret;

Modified: branches/SAMBA_3_2_0/source/include/smb_macros.h
===================================================================
--- branches/SAMBA_3_2_0/source/include/smb_macros.h	2007-08-29 00:56:13 UTC (rev 24758)
+++ branches/SAMBA_3_2_0/source/include/smb_macros.h	2007-08-29 01:23:31 UTC (rev 24759)
@@ -276,6 +276,11 @@
 
 /* The new talloc is paranoid malloc checker safe. */
 
+#if 0
+
+Disable these now we've checked all code paths and ensured
+NULL returns on zero request. JRA.
+
 #define TALLOC(ctx, size) talloc_zeronull(ctx, size, __location__)
 #define TALLOC_P(ctx, type) (type *)talloc_zeronull(ctx, sizeof(type), #type)
 #define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array_zeronull(ctx, sizeof(type), count, #type)
@@ -283,12 +288,27 @@
 #define TALLOC_ZERO(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
 #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero_zeronull(ctx, sizeof(type), #type)
 #define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array_zeronull(ctx, sizeof(type), count, #type)
+#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__)
+#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
+
+#else
+
+#define TALLOC(ctx, size) talloc_named_const(ctx, size, __location__)
+#define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type)
+#define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array(ctx, sizeof(type), count, #type)
+#define TALLOC_MEMDUP(ctx, ptr, size) _talloc_memdup(ctx, ptr, size, __location__)
+#define TALLOC_ZERO(ctx, size) _talloc_zero(ctx, size, __location__)
+#define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
+#define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type)
+#define TALLOC_SIZE(ctx, size) talloc(ctx, size, __location__)
+#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero(ctx, size, __location__)
+
+#endif
+
 #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, __location__)
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
 #define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
-#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__)
-#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
 
 /* only define PARANOID_MALLOC_CHECKER with --enable-developer and not compiling
    the smbmount utils */

Modified: branches/SAMBA_3_2_0/source/lib/util.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/util.c	2007-08-29 00:56:13 UTC (rev 24758)
+++ branches/SAMBA_3_2_0/source/lib/util.c	2007-08-29 01:23:31 UTC (rev 24759)
@@ -3294,6 +3294,11 @@
 	return IVAL(ptr,off);
 }
 
+#if 0
+
+Disable these now we've checked all code paths and ensured
+NULL returns on zero request. JRA.
+
 /****************************************************************
  talloc wrapper functions that guarentee a null pointer return
  if size == 0.
@@ -3392,3 +3397,4 @@
 	}
 	return talloc_named_const(context, size, name);
 }
+#endif

Modified: branches/SAMBA_3_2_0/source/libaddns/dns.h
===================================================================
--- branches/SAMBA_3_2_0/source/libaddns/dns.h	2007-08-29 00:56:13 UTC (rev 24758)
+++ branches/SAMBA_3_2_0/source/libaddns/dns.h	2007-08-29 01:23:31 UTC (rev 24759)
@@ -86,6 +86,11 @@
 
 #include <talloc.h>
 
+#if 0
+
+Disable these now we've checked all code paths and ensured
+NULL returns on zero request. JRA.
+
 void *_talloc_zero_zeronull(const void *ctx, size_t size, const char *name);
 void *_talloc_memdup_zeronull(const void *t, const void *p, size_t size, const char *name);
 void *_talloc_array_zeronull(const void *ctx, size_t el_size, unsigned count, const char *name);
@@ -99,12 +104,27 @@
 #define TALLOC_ZERO(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
 #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero_zeronull(ctx, sizeof(type), #type)
 #define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array_zeronull(ctx, sizeof(type), count, #type)
+#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__)
+#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
+
+#else
+
+#define TALLOC(ctx, size) talloc_named_const(ctx, size, __location__)
+#define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), #type)
+#define TALLOC_ARRAY(ctx, type, count) (type *)_talloc_array(ctx, sizeof(type), count, #type)
+#define TALLOC_MEMDUP(ctx, ptr, size) _talloc_memdup(ctx, ptr, size, __location__)
+#define TALLOC_ZERO(ctx, size) _talloc_zero(ctx, size, __location__)
+#define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
+#define TALLOC_ZERO_ARRAY(ctx, type, count) (type *)_talloc_zero_array(ctx, sizeof(type), count, #type)
+#define TALLOC_SIZE(ctx, size) talloc(ctx, size, __location__)
+#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero(ctx, size, __location__)
+
+#endif
+
 #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, __location__)
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type *)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
 #define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} } while(0)
-#define TALLOC_SIZE(ctx, size) talloc_zeronull(ctx, size, __location__)
-#define TALLOC_ZERO_SIZE(ctx, size) _talloc_zero_zeronull(ctx, size, __location__)
 
 /*******************************************************************
    Type definitions for int16, int32, uint16 and uint32.  Needed

Modified: branches/SAMBA_3_2_0/source/rpc_parse/parse_prs.c
===================================================================
--- branches/SAMBA_3_2_0/source/rpc_parse/parse_prs.c	2007-08-29 00:56:13 UTC (rev 24758)
+++ branches/SAMBA_3_2_0/source/rpc_parse/parse_prs.c	2007-08-29 01:23:31 UTC (rev 24759)
@@ -161,7 +161,7 @@
 
 	if (size && count) {
 		/* We can't call the type-safe version here. */
-		ret = (char *)_talloc_zero_array_zeronull(ps->mem_ctx, size, count,
+		ret = (char *)_talloc_zero_array(ps->mem_ctx, size, count,
 						 "parse_prs");
 	}
 	return ret;