[svn-commits] twilson: trunk r370474 - in /trunk: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Jul 24 22:51:28 2012
New Revision: 370474

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370474
Log:
Revert a change that broke compilation

1) There is no such function as ast_ref()
2) The patch was originally credited as the one uploaded by Guenther
   Kelleter (license 6372) via issue AST-921, but the patch committed
   was not the patch referenced on the issue.
3) Guenther Kelleter's patch was actually correct. It moved the
   ast_free above the presencechange_cleanup label. I am not
   committing his change as it is not technically necesary--calling
   ast_free(NULL) is perfectly safe and I worry that moving the
   ast_free outside of the label could lead to future bugs if
   someone ever adds another failure conditional and expects
   'goto presencechange_cleanup;' to clean up after everything.

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

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

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