From: Philip Prindeville <philipp@redfish-solutions.com>
Date: Thu, 25 Jan 2018 01:47:19 +0000 (-0700)
Subject: Be consistent in clearing out in php_iconv_string()
X-Git-Tag: php-7.1.15RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aad76a9b79e502a8ebc68b79d62e9009d4aba5b3;p=php

Be consistent in clearing out in php_iconv_string()
---

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.