You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.3 KiB
46 lines
1.3 KiB
commit 3763c8f1645983b5abc37c60597e1ecc1bf89019
|
|
Author: Philip Prindeville <philipp@redfish-solutions.com>
|
|
Date: Thu Jan 25 14:18:00 2018 -0700
|
|
|
|
Always free out_buf in php_iconv_string()
|
|
|
|
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
|
|
index 4289242..807bb14 100644
|
|
--- a/ext/iconv/iconv.c
|
|
+++ b/ext/iconv/iconv.c
|
|
@@ -699,6 +699,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
|
|
iconv_close(cd);
|
|
|
|
if (result == (size_t)(-1)) {
|
|
+ zend_string_free(out_buf);
|
|
switch (errno) {
|
|
case EINVAL:
|
|
retval = PHP_ICONV_ERR_ILLEGAL_CHAR;
|
|
@@ -715,7 +716,6 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
|
|
|
|
default:
|
|
/* other error */
|
|
- zend_string_free(out_buf);
|
|
return PHP_ICONV_ERR_UNKNOWN;
|
|
}
|
|
}
|
|
@@ -988,9 +988,6 @@ static php_iconv_err_t _php_iconv_strpos(size_t *pretval,
|
|
err = php_iconv_string(ndl, ndl_nbytes, &ndl_buf, GENERIC_SUPERSET_NAME, enc);
|
|
|
|
if (err != PHP_ICONV_ERR_SUCCESS) {
|
|
- if (ndl_buf != NULL) {
|
|
- zend_string_free(ndl_buf);
|
|
- }
|
|
return err;
|
|
}
|
|
|
|
@@ -2494,9 +2491,6 @@ PHP_NAMED_FUNCTION(php_if_iconv)
|
|
if (err == PHP_ICONV_ERR_SUCCESS && out_buffer != NULL) {
|
|
RETVAL_STR(out_buffer);
|
|
} else {
|
|
- if (out_buffer != NULL) {
|
|
- zend_string_free(out_buffer);
|
|
- }
|
|
RETURN_FALSE;
|
|
}
|
|
}
|