[svn-commits] kmoore: trunk r409569 - in /trunk: ./ main/astobj2.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Tue Mar  4 10:55:43 2014
New Revision: 409569

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=409569
Log:
AO2: Add an assert for bad objects

This adds an assert that will only be active if Asterisk is compiled
with DO_CRASH and allows the testsuite to fail tests that would
otherwise require log file parsing.
........

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

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

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

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

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

Modified: trunk/main/astobj2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/astobj2.c?view=diff&rev=409569&r1=409568&r2=409569
==============================================================================
--- trunk/main/astobj2.c (original)
+++ trunk/main/astobj2.c Tue Mar  4 10:55:43 2014
@@ -167,6 +167,7 @@
 				"bad magic number for object %p. Object is likely destroyed.\n",
 				user_data);
 		}
+		ast_assert(0);
 		return NULL;
 	}