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
This commit is contained in:
Russell Bryant
2005-02-27 01:40:43 +00:00
parent 3aeb519068
commit d6efd17100
2 changed files with 2 additions and 1 deletions

View File

@@ -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 -- DIALEDPEERNUMBER is now being set, so if you attempted to use it in the past and failed
it should work now. it should work now.
-- A callerid change caused many headaches, this has been reversed to the original 1.0 behavior. -- 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: -- app_voicemail:
-- If two people hit the voicemail system at the same time, and were leaving a message -- 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 the second message was overwriting the first. This has been fixed so that each one

View File

@@ -1037,7 +1037,7 @@ out:
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);
if((go_on>0) && (!chan->_softhangup)) if((go_on>0) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE))
res=0; res=0;
return res; return res;