[asterisk-commits] tilghman: trunk r128857 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jul  7 19:02:11 2008
New Revision: 128857

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

........
r128856 | tilghman | 2008-07-07 19:01:30 -0500 (Mon, 07 Jul 2008) | 7 lines

Check for non-NULL before stripping characters.
(closes issue #12954)
 Reported by: bfsworks
 Patches: 
       20080701__bug12954.diff.txt uploaded by Corydon76 (license 14)
 Tested by: deti

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

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

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=128857&r1=128856&r2=128857
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon Jul  7 19:02:11 2008
@@ -2421,7 +2421,7 @@
 	char bound[256];
 	char dur[256];
 	struct ast_tm tm;
-	char enc_cidnum[256], enc_cidname[256];
+	char enc_cidnum[256] = "", enc_cidname[256] = "";
 	char *passdata2;
 	size_t len_passdata;
 	char *greeting_attachment; 
@@ -2433,8 +2433,12 @@
 #define ENDL "\n"
 #endif
 
-	strip_control(cidnum, enc_cidnum, sizeof(enc_cidnum));
-	strip_control(cidname, enc_cidname, sizeof(enc_cidname));
+	if (cidnum) {
+		strip_control(cidnum, enc_cidnum, sizeof(enc_cidnum));
+	}
+	if (cidname) {
+		strip_control(cidname, enc_cidname, sizeof(enc_cidname));
+	}
 	gethostname(host, sizeof(host) - 1);
 
 	if (strchr(srcemail, '@'))