[asterisk-commits] russell: trunk r89038 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Nov  6 12:23:36 2007
New Revision: 89038

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89038
Log:
Merged revisions 89037 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89037 | russell | 2007-11-06 12:20:07 -0600 (Tue, 06 Nov 2007) | 11 lines

If someone were to delete the files used by an existing MOH class, and then
issue a reload, further use of that class could result in a crash due to
dividing by zero.  This set of changes fixes up some places to prevent this
from happening.

(closes issue #10948)
Reported by: jcomellas
Patches:
      res_musiconhold_division_by_zero.patch uploaded by jcomellas (license 282)
	  Additional changes added by me.

........

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

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

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=89038&r1=89037&r2=89038
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Tue Nov  6 12:23:36 2007
@@ -231,6 +231,11 @@
 		chan->stream = NULL;
 	}
 
+	if (!state->class->total_files) {
+		ast_log(LOG_WARNING, "No files available for class '%s'\n", state->class->name);
+		return -1;
+	}
+
 	/* If a specific file has been saved, use it */
 	if (state->save_pos >= 0) {
 		state->pos = state->save_pos;
@@ -320,7 +325,7 @@
 			/* initialize */
 			memset(state, 0, sizeof(*state));
 			state->class = class;
-			if (ast_test_flag(state->class, MOH_RANDOMIZE))
+			if (ast_test_flag(state->class, MOH_RANDOMIZE) && class->total_files)
 				state->pos = ast_random() % class->total_files;
 		}
 
@@ -1291,8 +1296,15 @@
 			AST_RWLIST_REMOVE_CURRENT(&mohclasses, list);
 			if (!moh->inuse)
 				ast_moh_destroy_one(moh);
-		} else if (moh->total_files)
-			moh_scan_files(moh);
+		} else if (moh->total_files) {
+			if (moh_scan_files(moh)) {
+				ast_log(LOG_WARNING, "No files found for class '%s'\n", moh->name);
+				moh->delete = 1;
+				AST_LIST_REMOVE_CURRENT(&mohclasses, list);
+				if (!moh->inuse)
+					ast_moh_destroy_one(moh);
+			}
+		}
 	}
 	AST_RWLIST_TRAVERSE_SAFE_END
 	AST_RWLIST_UNLOCK(&mohclasses);