[svn-commits] jrose: trunk r370466 - in /trunk: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Tue Jul 24 16:30:21 2012
New Revision: 370466

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370466
Log:
Don't attempt free of NULL ptr in pbx.c handle_presencechange

(closes issue AST-921)
Reported by: Guenther Kelleter
Patches:
    nullptr.patch uploaded by Guenther Kelleter (license 6372)


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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-10-digiumphones-merged (original)
+++ branch-10-digiumphones-merged Tue Jul 24 16:30:21 2012
@@ -1,1 +1,1 @@
-/branches/10-digiumphones:364766,365396,368791,368963-368965,368999,369026
+/branches/10-digiumphones:364766,365396,368791,368963-368965,368999,369026,370465

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=370466&r1=370465&r2=370466
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Tue Jul 24 16:30:21 2012
@@ -4820,7 +4820,7 @@
 	res = 0;
 
 presencechange_cleanup:
-	ast_free(hint_app);
+	ast_ref(hint_app, -1);
 	ao2_ref(pc, -1);
 
 	return res;