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 f688e4a82630bbead3e52e3f5afc976d39120165..988798f19fa52c497f8de40fea81d33bfd08f6f6 100644 (file)
--- 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);