From: Wez Furlong <wez@php.net>
Date: Thu, 29 Mar 2001 09:37:09 +0000 (+0000)
Subject: Fixed leak in php_iconv_string. Also returns FAILURE on failure,
X-Git-Tag: php-4.0.6RC1~538
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bd5696a6599436709c45e54c8e1e491664eaa70;p=php

Fixed leak in php_iconv_string. Also returns FAILURE on failure,
rather than -1
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index f688e4a826..988798f19f 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -126,15 +126,15 @@ int php_iconv_string(char *in_p, char **out, char *in_charset, char *out_charset
 		php_error(E_WARNING, "iconv: cannot convert from `%s' to `%s'",
 				  in_charset, out_charset);
 		efree(out_buffer);
-		return -1;
+		return FAILURE;
 	}
 	
 	result = icv(cd, (const char **) &in_p, &in_size, (char **)
 				   &out_p, &out_size);
 
     if (result == (size_t)(-1)) {
-        sprintf(out_buffer, "???") ;
-		return -1;
+		 efree(out_buffer);
+		return FAILURE;
     }
 
     icv_close(cd);