]> granicus.if.org Git - php/commitdiff
followup with #73276 merge
authorAnatol Belski <ab@php.net>
Wed, 12 Oct 2016 14:03:35 +0000 (16:03 +0200)
committerAnatol Belski <ab@php.net>
Wed, 12 Oct 2016 14:03:35 +0000 (16:03 +0200)
ext/openssl/openssl.c

index bf1f0c51a98cca2098c2cc812120e04f54dc1aad..648b110d619b474a0aed856380d408a6425d161b 100644 (file)
@@ -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