diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-01-26 22:28:48 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-01-26 22:28:48 +0100 |
| commit | fd255b8878b5e798e256c13b1e05a7e55fea38e8 (patch) | |
| tree | 2fe9810c5ec124fb31525a5f919c1b28f55af0ba /ext/iconv | |
| parent | aad12cb49c300a578d212d3f3e0fa00f6688161c (diff) | |
| parent | aad76a9b79e502a8ebc68b79d62e9009d4aba5b3 (diff) | |
| download | php-git-fd255b8878b5e798e256c13b1e05a7e55fea38e8.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'ext/iconv')
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index ec74585a00..9236066df4 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -559,6 +559,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. |