aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-08 19:41:42 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-08 19:41:42 +0000
commit631d1504e27949b47847f852c54e5e5471a7e8c1 (patch)
tree0305ecad514b4c82d642a02282122ae68c7866ad
parentbcb3e22ee374ea81c13fc6fbefba1d4107ff47d2 (diff)
Merged revisions 306966 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r306966 | jpeeler | 2011-02-08 13:41:21 -0600 (Tue, 08 Feb 2011) | 9 lines Merged revisions 306965 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r306965 | jpeeler | 2011-02-08 13:40:58 -0600 (Tue, 08 Feb 2011) | 1 line fix this line again ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@306967 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 8cce2d3f6..92af3ce62 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3935,7 +3935,7 @@ static int last_message_index(struct ast_vm_user *vmu, char *dir)
}
while ((msgdirent = readdir(msgdir))) {
- if (!strcmp(extension, "txt") && msgdirint < MAXMSGLIMIT && sscanf(msgdirent->d_name, "msg%10d.%3s", &msgdirint, extension) == 2) {
+ if (sscanf(msgdirent->d_name, "msg%30d.%3s", &msgdirint, extension) == 2 && !strcmp(extension, "txt") && msgdirint < MAXMSGLIMIT) {
map[msgdirint] = 1;
stopcount++;
ast_debug(4, "%s map[%d] = %d, count = %d\n", dir, msgdirint, map[msgdirint], stopcount);