From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 27 Feb 2005 01:40:43 +0000 (+0000)
Subject: fix seg fault with combination of 'g' and # transfer (bug #3650)
X-Git-Tag: 1.0.11.1~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6efd17100b74d8088969bd810bcc7f705ca68d9;p=thirdparty%2Fasterisk.git

fix seg fault with combination of 'g' and # transfer (bug #3650)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/CHANGES b/CHANGES
index 7e23db9904..09e8040381 100755
--- a/CHANGES
+++ b/CHANGES
@@ -35,6 +35,7 @@ Asterisk 1.0.6
     -- DIALEDPEERNUMBER is now being set, so if you attempted to use it in the past and failed
        it should work now.
     -- A callerid change caused many headaches, this has been reversed to the original 1.0 behavior.
+    -- A crash caused with the combination of the 'g' option and # transfer was fixed.
  -- app_voicemail:
     -- If two people hit the voicemail system at the same time, and were leaving a message
        the second message was overwriting the first. This has been fixed so that each one
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 76ae6a5d49..8d3436edc7 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1037,7 +1037,7 @@ out:
 	
 	LOCAL_USER_REMOVE(u);
 	
-	if((go_on>0) && (!chan->_softhangup))
+	if((go_on>0) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE))
 	    res=0;
 	    
 	return res;