From: Anatol Belski <ab@php.net>
Date: Wed, 12 Oct 2016 14:03:35 +0000 (+0200)
Subject: followup with #73276 merge
X-Git-Tag: php-7.1.0RC4~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7897e8cd6c1d6b201eb384fac38ed41a21420ae3;p=php

followup with #73276 merge

(cherry picked from commit b135ba3fa93fd4f085322573d2850b29cb662e21)
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 7fbbbe8792..1aa59ad43a 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -6458,6 +6458,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)
@@ -6465,12 +6470,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