com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/mcrypt/mcrypt.c

Commit: e892e2e25339c2f582dbb3f1b7e3660e9bf1ecee Author: Nikita Popov <nikic@php.net> Sat, 3 Oct 2015 10:13:06 +0200 Parents: b2988714aa08d933a33dd0e0101f5f0c9d08369b fe1933aae2185624bd51b1fd46b8d959f88daf4a Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e892e2e25339c2f582dbb3f1b7e3660e9bf1ecee Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM NEWS MM ext/mcrypt/mcrypt.c Diff: diff --cc NEWS index ec50289,7f5c7a4..d641ddd --- a/NEWS +++ b/NEWS @@@ -1,75 -1,24 +1,79 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2015, PHP 5.6.15 - -- Date: - . Fixed bug #70619 (DateTimeImmutable segfault). (Laruence) +15 Oct 2015, PHP 7.0..0 RC 5 + - Mcrypt: + . Fixed bug #70625 (mcrypt_encrypt() won't return data when no IV was + specified under RC4). (Nikita) + -- Mysqlnd: - . Fixed bug #70384 (mysqli_real_query():Unknown type 245 sent by the server). - (Andrey) - . Fixed bug #70572 segfault in mysqlnd_connect. (Andrey, Remi) +- Phpdbg + . Fixed bug #70614 (incorrect exit code in -rr mode with Exceptions). (Bob) -01 Oct 2015, PHP 5.6.14 +01 Oct 2015, PHP 7.0.0 RC 4 - Core: - . Fixed bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when - building extensions). (Adam) + . Added zend_internal_function.reserved[] fields.. (Dmitry) + . Fixed bug #70557 (Memleak on return type verifying failed). (Laruence) + . Fixed bug #70555 (fun_get_arg() on unsetted vars return UNKNOW). (Laruence) + . Fixed bug #70548 (Redundant information printed in case of uncaught engine + exception). (Laruence) + . Fixed bug #70547 (unsetting function variables corrupts backtrace). + (Laruence) + . Fixed bug #70528 (assert() with instanceof adds apostrophes around class + name). (Laruence) + . Fixed bug #70481 (Memory leak in auto_global_copy_ctor() in ZTS build). + (Laruence) + +- DOM: + . Fixed bug #70558 ("Couldn't fetch" error in + DOMDocument::registerNodeClass()). (Laruence) + +- FPM: + . Fixed bug #70538 ("php-fpm -i" crashes). (rainer dot jung at + kippdata dot de) + . Fixed bug #70279 (HTTP Authorization Header is sometimes passed to newer + reqeusts). (Laruence) + +- Opcache + . Attmpt to fix "Unable to reattach to base address" problem. (Matt Ficken) + +- OpenSSL + . Require at least OpenSSL version 0.9.8. (Jakub Zelenka) + . Fixed bug #68312 (Lookup for openssl.cnf causes a message box). (Anatol) + +- Phar: + . Fixed bug #69720 (Null pointer dereference in phar_get_fp_offset()). (Stas) + . FIxed bug #70433 (Uninitialized pointer in phar_make_dirstream when zip + entry filename is "/"). (Stas) + +- Phpdbg: + . Fixed bug #70532 (phpdbg must respect set_exception_handler). (Bob) + . Fixed bug #70531 (Run and quit mode (-qrr) should not fallback to + interactive mode). (Bob) + . Fixed bug #70533 (Help overview (-h) does not rpint anything under Windows). + (Anatol) + +- Session: + . Fixed bug #70529 (Session read causes "String is not zero-terminated" error). + (Yasuo) + +- SQLite3: + . Fixed bug #70571 (Memory leak in sqlite3_do_callback). (Adam) + +-SPL: + . Fixed bug #70573 (Cloning SplPriorityQueue leads to memory leaks). (Dmitry) + +- XMLRPC + . Fixed bug #70526 (xmlrpc_set_type returns false on success). (Laruence) + +- XSL: + . Fixed bug #70535 (XSLT: free(): invalid pointer). (Laruence) + +17 Sep 2015, PHP 7.0.0 RC 3 + +- Core: + . Fixed bug #70431 (Memory leak in php_ini.c).. (Senthil, Laruence) + . Fixed bug #70478 (**= does no longer work). (Bob) - CLI server: . Fixed bug #68291 (404 on urls with '+'). (cmb) diff --cc ext/mcrypt/mcrypt.c index a9098ed,624e2ce..bc65378 --- a/ext/mcrypt/mcrypt.c +++ b/ext/mcrypt/mcrypt.c @@@ -1218,9 -1237,13 +1218,13 @@@ static int php_mcrypt_ensure_valid_iv(M { if (mcrypt_enc_mode_has_iv(td) == 1) { int expected_iv_size = mcrypt_enc_get_iv_size(td); + if (expected_iv_size == 0) { + /* Algorithm does not use IV, even though mode supports it */ + return SUCCESS; + } if (!iv) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Encryption mode requires an initialization vector of size %d", expected_iv_size ); return FAILURE;