From: Yasuo Ohgaki <yohgaki@php.net>
Date: Thu, 28 Feb 2002 03:09:01 +0000 (+0000)
Subject: Fix iconv. Patch by (itai@siftology.com)
X-Git-Tag: php-4.2.0RC1~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98861da887022a2c0338161e393645748562df8e;p=php

Fix iconv. Patch by (itai@siftology.com)
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 4e9e4d747a..7017ceb63b 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -138,12 +138,12 @@ static int php_iconv_string(char *in_p, unsigned int in_len,
     /*
 	  FIXME: This is not the right way to get output size...
 	  This is not space efficient for large text.
-	  This is also problem encoding like UTF-7/UTF-8/ISO-2022 which
+	  This is also problem for encoding like UTF-7/UTF-8/ISO-2022 which
 	  a single char can be more than 4 bytes.
 	  I added 15 extra bytes for safety. <yohgaki@php.net>
 	*/
     out_size = in_len * sizeof(ucs4_t) + 16;
-    out_buffer = (char *) ecalloc(1, out_size);
+    out_buffer = (char *) emalloc(out_size);
 
 	*out = out_buffer;
     out_p = out_buffer;
@@ -167,7 +167,7 @@ static int php_iconv_string(char *in_p, unsigned int in_len,
     }
 
 	*out_len = out_size - out_left;
-	out[*out_len] = '\0';
+	out_buffer[*out_len] = '\0';
     icv_close(cd);
 
     return SUCCESS;
@@ -193,7 +193,7 @@ PHP_NAMED_FUNCTION(php_if_iconv)
 	if (php_iconv_string(Z_STRVAL_PP(in_buffer), Z_STRLEN_PP(in_buffer),
 						 &out_buffer,  &out_len,
 						 Z_STRVAL_PP(in_charset), Z_STRVAL_PP(out_charset)) == SUCCESS) {
-		RETVAL_STRINGL(out_buffer, out_len + 1, 0);
+		RETVAL_STRINGL(out_buffer, out_len, 0);
 	} else {
 		RETURN_FALSE;
 	}