From: Terry Wilson <twilson@digium.com>
Date: Wed, 25 Jul 2012 03:45:20 +0000 (+0000)
Subject: Revert a change that broke compilation
X-Git-Tag: 10.8.0-digiumphones-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3f9e1b64d7af20f83cab93b2a96fd57ef545aaf;p=thirdparty%2Fasterisk.git

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.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@370473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 026cafe1cd..85a22aab47 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4805,7 +4805,7 @@ static int handle_presencechange(void *datap)
 	res = 0;
 
 presencechange_cleanup:
-	ast_ref(hint_app, -1);
+	ast_free(hint_app);
 	ao2_ref(pc, -1);
 
 	return res;