From: Rui Hirokawa <hirokawa@php.net>
Date: Fri, 12 Apr 2002 15:07:48 +0000 (+0000)
Subject: fixed a bug which causes crash when charset is not set.
X-Git-Tag: php-4.2.0RC3~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd4fb6bddccb9933c4adcf7844ed04d0b5a4339c;p=php

fixed a bug which causes crash when charset is not set.
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index cc019e1e12..7868a8b073 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -1476,14 +1476,16 @@ PHP_FUNCTION(mb_output_handler)
  		if (SG(sapi_headers).send_default_content_type ) {
 			mimetype = SG(default_mimetype) ? SG(default_mimetype) : SAPI_DEFAULT_MIMETYPE;
 			charset = mbfl_no2preferred_mime_name(encoding);
-			len = (sizeof ("Content-Type:")-1) + strlen(mimetype) + (sizeof (";charset=")-1) + strlen(charset) + 1;
-			p = emalloc(len);
-			strcpy(p, "Content-Type:");
-			strcat(p, mimetype);
-			strcat(p, ";charset=");
-			strcat(p, charset);
-			if (sapi_add_header(p, len, 0) != FAILURE)
-				SG(sapi_headers).send_default_content_type = 0;
+			if (charset) {
+				len = (sizeof ("Content-Type:")-1) + strlen(mimetype) + (sizeof (";charset=")-1) + strlen(charset) + 1;
+				p = emalloc(len);
+				strcpy(p, "Content-Type:");
+				strcat(p, mimetype);
+				strcat(p, ";charset=");
+				strcat(p, charset);
+				if (sapi_add_header(p, len, 0) != FAILURE)
+					SG(sapi_headers).send_default_content_type = 0;
+			}
  			/* activate the converter */
  			MBSTRG(outconv) = mbfl_buffer_converter_new(MBSTRG(current_internal_encoding), encoding, 0);
  		}