com php-src: Fix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2): NEWS ext/openssl/openssl.c
| From: | Jakub Zelenka | Date: | Sun, 06 Nov 2016 20:40:51 +0000 |
| Subject: | com php-src: Fix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2): NEWS ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95419@lists.php.net to get a copy of this message | ||
Commit: 493b2bff02531b0ead233177a2a0846c75e94777
Author: Jakub Zelenka <bukka@php.net> Sun, 6 Nov 2016 20:40:51 +0000
Parents: b044a7429e750071ef152595a5fc4e880f88430e
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=493b2bff02531b0ead233177a2a0846c75e94777
Log:
Fix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2)
Bugs:
https://bugs.php.net/72776
Changed paths:
M NEWS
M ext/openssl/openssl.c
Diff:
diff --git a/NEWS b/NEWS
index c2f3589..8d5b14e 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ PHP NEWS
. Fixed bug #73402 (Opcache segfault when using class constant to call a
method). (Laruence)
+- OpenSSL
+ . Fixed bug #72776 (Invalid parameter in memcpy function trough
+ openssl_pbkdf2). (Jakub Zelenka)
+
10 Nov 2016, PHP 5.6.28
- Core:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 01f2a09..f8641c6 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4059,7 +4059,7 @@ PHP_FUNCTION(openssl_pbkdf2)
return;
}
- if (key_length <= 0) {
+ if (key_length <= 0 || key_length > INT_MAX) {
RETURN_FALSE;
}