[asterisk-commits] jpeeler: trunk r306867 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Tue Feb  8 10:22:07 2011
New Revision: 306867

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306867
Log:
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
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=306867&r1=306866&r2=306867
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Feb  8 10:22:07 2011
@@ -3916,7 +3916,7 @@
 	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 @@
 	}
 
 	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);