[asterisk-commits] mjordan: branch 11 r379609 - in /branches/11: ./ apps/app_minivm.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Jan 20 22:07:05 2013
New Revision: 379609

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379609
Log:
Fix crash in app_minivm when mime encoding string

An incorrect string initializations was left in ast_str_encode_mime from the
patch that converted string manipulations to use ast_str strings (r191140).
The string initialization causes a crash when ast_str_set is called on
the string later on in the function.

(closes issue ASTERISK-18967)
Reported by: Chris Boot
patches:
  minivm-null-pointer-dereference-fix.patch uploaded by bootc (license 6309)

(issue ASTERISK-20854)
Reported by: Chris Warr
Tested by: Chris Warr
........

Merged revisions 379608 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/11/   (props changed)
    branches/11/apps/app_minivm.c

Propchange: branches/11/
------------------------------------------------------------------------------
--- branch-1.8-merged (original)
+++ branch-1.8-merged Sun Jan 20 22:07:05 2013
@@ -1,1 +1,1 @@
-/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547
+/branches/1.8:1-378147,378164,378356,378375,378427,378455-378456,378486,378514,378554,378591,378733,378776,378933,378967,379001,379145,379178,379226,379276,379310,379342,379392,379547,379608

Modified: branches/11/apps/app_minivm.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_minivm.c?view=diff&rev=379609&r1=379608&r2=379609
==============================================================================
--- branches/11/apps/app_minivm.c (original)
+++ branches/11/apps/app_minivm.c Sun Jan 20 22:07:05 2013
@@ -1159,7 +1159,6 @@
 {
 	struct ast_str *tmp = ast_str_alloca(80);
 	int first_section = 1;
-	*end = '\0';
 
 	ast_str_reset(*end);
 	ast_str_set(&tmp, -1, "=?%s?Q?", charset);