automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16545 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 2a27dcec8a953f2c5714fc4db676fad8ccdb6ee4..97ae3d8712960ed9841262bbfeb40e990d4a8032 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -778,6 +778,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);