summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2012-07-25 03:51:28 +0000
committerTerry Wilson <twilson@digium.com>2012-07-25 03:51:28 +0000
commit38f1081fd396e39e0c02600a5d58080880838131 (patch)
tree05e442ac40461f6a8eb882bcd25c684b7d0d1259 /main
parent729c91b312699048c48559000525ceeffe6fe80c (diff)
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/trunk@370474 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/pbx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 0e0c6f366..a1ed1b52d 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4820,7 +4820,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;