[svn-commits] rmudgett: branch 12 r398726 - in /branches/12: ./ main/astmm.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Sep  9 18:23:02 2013
New Revision: 398726

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398726
Log:
MALLOC_DEBUG: Change fence magic number to be completely different from the freed magic number.

Race conditions between freeing a nul terminated string and
ast_strdup()'ing it are more likely to be detected if the fence and freed
magic numbers are completely different.
........

Merged revisions 398703 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 398721 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/main/astmm.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/astmm.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/astmm.c?view=diff&rev=398726&r1=398725&r2=398726
==============================================================================
--- branches/12/main/astmm.c (original)
+++ branches/12/main/astmm.c Mon Sep  9 18:23:02 2013
@@ -71,7 +71,7 @@
 #undef vasprintf
 #undef asprintf
 
-#define FENCE_MAGIC		0xdeadbeef	/*!< Allocated memory high/low fence overwrite check. */
+#define FENCE_MAGIC		0xfeedbabe	/*!< Allocated memory high/low fence overwrite check. */
 #define FREED_MAGIC		0xdeaddead	/*!< Freed memory wipe filler. */
 #define MALLOC_FILLER	0x55		/*!< Malloced memory filler.  Must not be zero. */