diff options
| author | Anatol Belski <ab@php.net> | 2016-10-12 16:03:35 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-13 00:36:25 +0200 |
| commit | 3ec841fcb1f89c2a203e06fe1249a53bbe51c43d (patch) | |
| tree | 8ff57b45ecd49f96a7d69245c7c41f450d613b92 | |
| parent | 91ec0ac723b795dadb3a879a5f5e256de7aa6539 (diff) | |
| download | php-git-3ec841fcb1f89c2a203e06fe1249a53bbe51c43d.tar.gz | |
followup with #73276 merge
(cherry picked from commit b135ba3fa93fd4f085322573d2850b29cb662e21)
| -rw-r--r-- | ext/openssl/openssl.c | 11 |
1 files changed, 5 insertions, 6 deletions
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 |