From: Jeff Peeler <jpeeler@digium.com>
Date: Tue, 8 Feb 2011 19:41:21 +0000 (+0000)
Subject: Merged revisions 306965 via svnmerge from
X-Git-Tag: 1.6.2.18-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5fef6ab6858b8ca9885fd52201ff87ff4cbe443;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@306966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 195f1e0c1b..5d6942c4ec 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -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);