Merged revisions 16534 via svnmerge from

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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 289d139d070a172e41f88dc71b28ad5f9c39d8eb..4c0f932135993d76703d25e71820057a1668a3ea 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -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);