[asterisk-commits] coreyfarrell: trunk r417511 - in /trunk: ./ main/astobj2.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Fri Jun 27 14:27:59 2014
New Revision: 417511

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=417511
Log:
Ensure REF_DEBUG records entrys for attempts to ao2_ref an invalid object

This change ensures that __ao2_ref_debug writes to ref_log when given a
non-NULL pointer to an invalid ao2 object.  This is to ensure that we
record any attempt manipulate references of already freed objects.

ASTERISK-23948 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/3677/
........

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

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

Merged revisions 417509 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=417511&r1=417510&r2=417511
==============================================================================
--- trunk/main/astobj2.c (original)
+++ trunk/main/astobj2.c Fri Jun 27 14:27:59 2014
@@ -499,14 +499,8 @@
 {
 	struct astobj2 *obj = INTERNAL_OBJ(user_data);
 
-	if (obj == NULL) {
-		ast_log_backtrace();
-		ast_assert(0);
-		return -1;
-	}
-
-	if (ref_log) {
-		if (obj->priv_data.ref_counter + delta == 0) {
+	if (ref_log && user_data) {
+		if (obj && obj->priv_data.ref_counter + delta == 0) {
 			fprintf(ref_log, "%p,%d,%d,%s,%d,%s,**destructor**,%s\n", user_data, delta, ast_get_tid(), file, line, func, tag);
 			fflush(ref_log);
 		} else if (delta != 0) {
@@ -515,6 +509,13 @@
 			fflush(ref_log);
 		}
 	}
+
+	if (obj == NULL) {
+		ast_log_backtrace();
+		ast_assert(0);
+		return -1;
+	}
+
 	return internal_ao2_ref(user_data, delta, file, line, func);
 }