[asterisk-commits] bbryant: branch 1.6.2 r285196 - in /branches/1.6.2: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Tue Sep  7 12:49:07 2010
New Revision: 285196

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

........
  r285194 | bbryant | 2010-09-07 13:45:41 -0400 (Tue, 07 Sep 2010) | 10 lines
  
  Fixes voicemail.conf issues where mailboxes with passwords that don't precede a comma would throw unnecessary error messages.
  
  (closes issue #15726)
  Reported by: 298
  Patches: 
        M15726.diff uploaded by junky (license 177)
  Tested by: junky
  
  Review: [full review board URL with trailing slash]
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_voicemail.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Sep  7 12:49:07 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048,283123,283380,283690,283880,283960,284316,284393,284478,284703,284777,284881,285088
+/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048,283123,283380,283690,283880,283960,284316,284393,284478,284703,284777,284881,285088,285194

Modified: branches/1.6.2/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_voicemail.c?view=diff&rev=285196&r1=285195&r2=285196
==============================================================================
--- branches/1.6.2/apps/app_voicemail.c (original)
+++ branches/1.6.2/apps/app_voicemail.c Tue Sep  7 12:49:07 2010
@@ -1380,11 +1380,12 @@
 				}
 				value = strstr(tmp,",");
 				if (!value) {
-					ast_log(AST_LOG_WARNING, "variable has bad format.\n");
-					break;
+					new = alloca(strlen(newpassword)+1);
+					sprintf(new, "%s", newpassword);
+				} else {
+					new = alloca((strlen(value)+strlen(newpassword)+1));
+					sprintf(new,"%s%s", newpassword, value);
 				}
-				new = alloca((strlen(value)+strlen(newpassword)+1));
-				sprintf(new,"%s%s", newpassword, value);
 				if (!(cat = ast_category_get(cfg, category))) {
 					ast_log(AST_LOG_WARNING, "Failed to get category structure.\n");
 					break;