[svn-commits] mmichelson: branch 1.6.0 r152647 - in /branches/1.6.0: ./ apps/app_directory.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Oct 29 15:54:49 2008
New Revision: 152647

URL: http://svn.digium.com/view/asterisk?view=rev&rev=152647
Log:
Merged revisions 152646 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r152646 | mmichelson | 2008-10-29 15:53:53 -0500 (Wed, 29 Oct 2008) | 9 lines

If there was no named defined in a voicemail.conf mailbox
entry, then app_directory would crash when attempting to
read that entry from the file. We now check for the NULL
or empty string properly so that there will be no crash.

(closes issue #13804)
Reported by: bluecrow76


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_directory.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_directory.c?view=diff&rev=152647&r1=152646&r2=152647
==============================================================================
--- branches/1.6.0/apps/app_directory.c (original)
+++ branches/1.6.0/apps/app_directory.c Wed Oct 29 15:54:49 2008
@@ -222,6 +222,10 @@
 {
 	char digit;
 
+	if (ast_strlen_zero(text)) {
+		return -1;
+	}
+
 	while (*template) {
 		digit = toupper(*text++);
 		switch (digit) {