From: Mark Michelson Date: Fri, 14 Nov 2008 15:20:03 +0000 (+0000) Subject: Merged revisions 156816 via svnmerge from X-Git-Tag: 1.6.2.0-beta1~864 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea9955dd2a98281b0c317ace22b62c889fadb161;p=thirdparty%2Fasterisk.git Merged revisions 156816 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r156816 | mmichelson | 2008-11-14 09:18:59 -0600 (Fri, 14 Nov 2008) | 10 lines If the prompt to reenter a voicemail password timed out, it resulted in the password not being saved, even if the input matched what you gave when first prompted to enter a new password. This is because the return value of ast_readstring was checked, but not checked properly. This bug was discovered by Jared Smith during an Asterisk training course. Thanks for reporting it! ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@156817 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index f888f3e67e..5e35b688f5 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -8185,7 +8185,7 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct if (cmd < 0) break; - if ((cmd = ast_readstring(chan,newpassword2 + strlen(newpassword2),sizeof(newpassword2)-1,2000,10000,"#"))) { + if ((cmd = ast_readstring(chan,newpassword2 + strlen(newpassword2),sizeof(newpassword2)-1,2000,10000,"#")) < 0) { break; } }