aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-08 16:22:07 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-08 16:22:07 +0000
commit924f99c3c423f4b6319c292bd6653db6a5c3546a (patch)
tree2baba5598f3126b804b41cce4cf2cafffd80a0ff
parentbf196e65c5cca96cf56aa80cd292d4916a3d2fad (diff)
Merged revisions 306866 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r306866 | jpeeler | 2011-02-08 10:21:45 -0600 (Tue, 08 Feb 2011) | 16 lines Merged revisions 306865 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r306865 | jpeeler | 2011-02-08 10:21:25 -0600 (Tue, 08 Feb 2011) | 9 lines Merged revisions 306864 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r306864 | jpeeler | 2011-02-08 10:19:17 -0600 (Tue, 08 Feb 2011) | 1 line make this safer and fully correct, pointed out by Steve Davis ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@306867 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_voicemail.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 7223d3d4f..25fcb0935 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3916,7 +3916,7 @@ static int last_message_index(struct ast_vm_user *vmu, char *dir)
DIR *msgdir;
struct dirent *msgdirent;
int msgdirint;
- char extension[3];
+ char extension[4];
int stopcount = 0;
/* Reading the entire directory into a file map scales better than
@@ -3928,7 +3928,7 @@ static int last_message_index(struct ast_vm_user *vmu, char *dir)
}
while ((msgdirent = readdir(msgdir))) {
- if (sscanf(msgdirent->d_name, "msg%30d.%3s", &msgdirint, extension) == 2 && msgdirint < MAXMSGLIMIT && !strcmp(extension, "txt")) {
+ if (!strcmp(extension, "txt") && msgdirint < MAXMSGLIMIT && sscanf(msgdirent->d_name, "msg%10d.%3s", &msgdirint, extension) == 2) {
map[msgdirint] = 1;
stopcount++;
ast_debug(4, "%s map[%d] = %d, count = %d\n", dir, msgdirint, map[msgdirint], stopcount);