]> 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>
Thu, 13 Oct 2016 23:43:02 +0000 (01:43 +0200)
(cherry picked from commit b135ba3fa93fd4f085322573d2850b29cb662e21)

ext/openssl/openssl.c

index 7fbbbe87921ea81eb201d24f06a9fd5b8342614f..1aa59ad43adae62cc9bf7147eb80c314d1817972 100644 (file)
@@ -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