Changeset 745 for trunk/server/lib/util/talloc_stack.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/talloc_stack.c (modified) (3 diffs)

trunk/server/lib/util/talloc_stack.c

@@ -69 +69 @@
 {
 #if defined(PARANOID_MALLOC_CHECKER)
-#ifdef malloc
-#undef malloc
+#ifdef calloc
+#undef calloc
 #endif
 #endif
-        struct talloc_stackframe *ts =
-                (struct talloc_stackframe *)malloc(sizeof(struct talloc_stackframe));
+        struct talloc_stackframe *ts = (struct talloc_stackframe *)calloc(
+                1, sizeof(struct talloc_stackframe));
 #if defined(PARANOID_MALLOC_CHECKER)
-#define malloc(s) __ERROR_DONT_USE_MALLOC_DIRECTLY
+#define calloc(n, s) __ERROR_DONT_USE_MALLOC_DIRECTLY
 #endif
 
@@ -82 +82 @@
                 smb_panic("talloc_stackframe_init malloc failed");
         }
-
-        ZERO_STRUCTP(ts);
 
         SMB_THREAD_ONCE(&ts_initialized, talloc_stackframe_init, NULL);
@@ -103 +101 @@
                         break;
                 }
-                talloc_free(ts->talloc_stack[i]);
-                ts->talloc_stack[i] = NULL;
+                TALLOC_FREE(ts->talloc_stack[i]);
         }