From: Anatol Belski Date: Wed, 12 Oct 2016 14:03:35 +0000 (+0200) Subject: followup with #73276 merge X-Git-Tag: php-7.1.0RC4~21^2~24 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b135ba3fa93fd4f085322573d2850b29cb662e21;p=php followup with #73276 merge --- diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index bf1f0c51a9..648b110d61 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -5546,6 +5546,11 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) return; } + if (zstrong_result_returned) { + zval_dtor(zstrong_result_returned); + ZVAL_FALSE(zstrong_result_returned); + } + if (buffer_length <= 0 #ifndef PHP_WIN32 || ZEND_LONG_INT_OVFL(buffer_length) @@ -5553,12 +5558,6 @@ PHP_FUNCTION(openssl_random_pseudo_bytes) ) { RETURN_FALSE; } - - if (zstrong_result_returned) { - zval_dtor(zstrong_result_returned); - ZVAL_FALSE(zstrong_result_returned); - } - buffer = zend_string_alloc(buffer_length, 0); #ifdef PHP_WIN32