Merged revisions 16534 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 30 Mar 2006 17:58:16 +0000 (17:58 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 30 Mar 2006 17:58:16 +0000 (17:58 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r16534 | file | 2006-03-30 13:55:28 -0400 (Thu, 30 Mar 2006) | 2 lines

Do not exceed the array size for maximum allowed moh files. (issue #6842)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16535 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_musiconhold.c

index 289d139..4c0f932 100644 (file)
@@ -776,6 +776,11 @@ static int moh_scan_files(struct mohclass *class) {
 
                if (i == class->total_files)
                        strcpy(class->filearray[class->total_files++], filepath);
+
+               /* If the new total files is equal to the maximum allowed, stop adding new ones */
+               if (class->total_files == MAX_MOHFILES)
+                       break;
+
        }
 
        closedir(files_DIR);