[asterisk-commits] rmudgett: trunk r398732 - in /trunk: ./ main/astmm.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Sep  9 18:29:44 2013
New Revision: 398732

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398732
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
........

Merged revisions 398726 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/astmm.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Mon Sep  9 18:29:44 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-398651,398694
+/branches/12:1-398558,398560-398577,398579-398651,398694,398726

Modified: trunk/main/astmm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/astmm.c?view=diff&rev=398732&r1=398731&r2=398732
==============================================================================
--- trunk/main/astmm.c (original)
+++ trunk/main/astmm.c Mon Sep  9 18:29:44 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. */