[asterisk-commits] rmudgett: branch 10 r364903 - in /branches/10: ./ main/astobj2.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue May  1 18:14:12 2012
New Revision: 364903

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364903
Log:
Fixed __ao2_ref() validating user_data twice.

(closes issue ASTERISK-19755)
Reported by: Gunther Kelleter
Patches:
      ao2_ref.patch (license #6372) patch uploaded by Gunther Kelleter
........

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

Modified:
    branches/10/   (props changed)
    branches/10/main/astobj2.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/main/astobj2.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/main/astobj2.c?view=diff&rev=364903&r1=364902&r2=364903
==============================================================================
--- branches/10/main/astobj2.c (original)
+++ branches/10/main/astobj2.c Tue May  1 18:14:12 2012
@@ -229,11 +229,6 @@
 
 int __ao2_ref(void *user_data, const int delta)
 {
-	struct astobj2 *obj = INTERNAL_OBJ(user_data);
-
-	if (obj == NULL)
-		return -1;
-
 	return internal_ao2_ref(user_data, delta);
 }