com php-src: Store errors in openssl_pbkdf2: ext/openss l/openssl.c
| From: | Jakub Zelenka | Date: | Sun, 31 Jan 2016 11:55:36 +0000 |
| Subject: | com php-src: Store errors in openssl_pbkdf2: ext/openss l/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92451@lists.php.net to get a copy of this message | ||
Commit: 8a251a8ec8e67656c946f1d3ca8a5088d48298df
Author: Jakub Zelenka <bukka@php.net> Sun, 31 Jan 2016 11:55:36 +0000
Parents: 62b489287ead79855fd08389946ad0b50c119016
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8a251a8ec8e67656c946f1d3ca8a5088d48298df
Log:
Store errors in openssl_pbkdf2
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 0febcc7..5b68999 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4310,6 +4310,7 @@ PHP_FUNCTION(openssl_pbkdf2)
ZSTR_VAL(out_buffer)[key_length] = 0;
RETURN_NEW_STR(out_buffer);
} else {
+ php_openssl_store_errors();
zend_string_release(out_buffer);
RETURN_FALSE;
}