From bd31630ab00c7928d10fbdee1a5bee586391a257 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 14 Nov 2008 15:22:06 +0000 Subject: [PATCH] Merged revisions 156817 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r156817 | mmichelson | 2008-11-14 09:20:03 -0600 (Fri, 14 Nov 2008) | 18 lines 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/branches/1.6.0@156818 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 2af30be524..913c7c487e 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -7161,7 +7161,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; } }