]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 306965 via svnmerge from
authorJeff Peeler <jpeeler@digium.com>
Tue, 8 Feb 2011 19:41:21 +0000 (19:41 +0000)
committerJeff Peeler <jpeeler@digium.com>
Tue, 8 Feb 2011 19:41:21 +0000 (19:41 +0000)
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@306966 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index 195f1e0c1b23fe5fa846493ffaa0b7b9dae79dfc..5d6942c4ec3cbe0fdbea4dbdfff3ce1db53e5970 100644 (file)
@@ -3774,7 +3774,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);