diff options
| author | Anatol Belski <ab@php.net> | 2016-10-12 16:03:35 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-14 01:43:02 +0200 |
| commit | 7897e8cd6c1d6b201eb384fac38ed41a21420ae3 (patch) | |
| tree | eb88ad7f2ff83899b0f6fcd9254343d780f696a9 | |
| parent | 48f06ada897a01b94516958f0581e26d90b53140 (diff) | |
| download | php-git-7897e8cd6c1d6b201eb384fac38ed41a21420ae3.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 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 |