aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-14 15:22:06 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-14 15:22:06 +0000
commit52f1a195f62a55ac12939e27a04956aaad4f38c7 (patch)
tree6875021e6bb9471a7f737517b7e24d831d079722
parent3db0184ac424374ac2b835b271466b5f746be92e (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@156818 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_voicemail.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 2af30be52..913c7c487 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;
}
}