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

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 12be8153fa..504794bfd0 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3762,7 +3762,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
@@ -3774,7 +3774,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);