summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Prindeville <philipp@redfish-solutions.com>2018-01-24 18:47:19 -0700
committerNikita Popov <nikita.ppv@gmail.com>2018-01-26 22:28:27 +0100
commitaad76a9b79e502a8ebc68b79d62e9009d4aba5b3 (patch)
tree5a8b3f06fae4f4a7b4c7726299c0d96e4826ca7b
parentf80e59a566d3446bdc531cb89c96fd1eb019a2d6 (diff)
downloadphp-git-aad76a9b79e502a8ebc68b79d62e9009d4aba5b3.tar.gz
Be consistent in clearing out in php_iconv_string()
-rw-r--r--ext/iconv/iconv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index cff52fcd32..df44a5cda0 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -563,6 +563,8 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
size_t result;
zend_string *ret, *out_buffer;
+ *out = NULL;
+
/*
This is not the right way to get output size...
This is not space efficient for large text.