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

Commit: 0d2c4f822c614c544df736a30dffc00104fdbd57 Author: Nikita Popov <nikic@php.net> Wed, 27 Jul 2016 15:56:52 +0200 Parents: 6714f73545a8a186931f6fa91c23c4b700ba8ef7 cce457c68c3a15efafea3a30560c54f74f3f5ee1 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0d2c4f822c614c544df736a30dffc00104fdbd57 Log: Merge branch 'PHP-5.6' into PHP-7.0 Conflicts: ext/standard/ftp_fopen_wrapper.c Changed paths: MM NEWS MM ext/standard/ftp_fopen_wrapper.c Diff: diff --cc NEWS index 6d1b69e,1e3ef3b..241dcad --- a/NEWS +++ b/NEWS @@@ -94,42 -57,38 +94,44 @@@ PH - Streams: . Fixed bug #41021 (Problems with the ftps wrapper).. (vhuk) . Fixed bug #54431 (opendir() does not work with ftps:// wrapper). (vhuk) + . Fixed bug #72667 (opendir() with ftp:// attempts to open data stream for + non-existent directories). (vhuk) -- SPL: - . Fixed bug #72122 (IteratorIterator breaks '@' error suppression).. (kinglozzer) - . Fixed bug #72646 (SplFileObject::getCsvControl does not return the escape - character). (cmb) +- XMLRPC: + . Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing + array elements). (Laruence) + +- Wddx: + . Fixed bug #72564 (boolean always deserialized as "true") (Remi) -21 Jul 2016, PHP 5.6.24 +- Zip: + . Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd). + (Laruence) + +21 Jul 2016 PHP 7.0.9 - Core: - . Fixed bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA). - (mike dot laspina at gmail dot com, Remi) - . Fixed bug #72496 (Cannot declare public method with signature incompatible - with parent private method). (Pedro Magalhães) - . Fixed bug #72138 (Integer Overflow in Length of String-typed ZVAL). (Stas) + . Fixed bug #72508 (strange references after recursive function call and + "switch" statement). (Laruence) . Fixed bug #72513 (Stack-based buffer overflow vulnerability in - virtual_file_ex). (loianhtuan at gmail dot com) - . Fixed bug #72562 (Use After Free in unserialize() with Unexpected Session - Deserialization). (taoguangchen at icloud dot com) - . Fixed bug #72573 (HTTP_PROXY is improperly trusted by some PHP libraries and - applications). (CVE-2016-5385) (Stas) + virtual_file_ex). (Stas) + . Fixed bug #72573 (HTTP_PROXY is improperly trusted by some PHP libraries + and applications). (Stas) - bz2: - . Fixed bug #72447 (Type Confusion in php_bz2_filter_create()). (gogil at - stealien dot com). . Fixed bug #72613 (Inadequate error handling in bzread()). (Stas) -- EXIF: - . Fixed bug #50845 (exif_read_data() returns corrupted exif headers). - (Bartosz Dziewoński) -- EXIF: +- CLI: + . Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify + router.php). (Laruence) + +- COM: + .. Fixed bug #72498 (variant_date_from_timestamp null dereference). (Anatol) + +- Curl: + . Fixed bug #72541 (size_t overflow lead to heap corruption). (Stas) + +- Exif: . Fixed bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE). (Stas) . Fixed bug #72618 (NULL Pointer Dereference in exif_process_user_comment). diff --cc ext/standard/ftp_fopen_wrapper.c index cca67c8,b7eeb56..10dcdb8 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@@ -707,8 -716,11 +707,11 @@@ php_stream * php_stream_ftp_opendir(php if (result > 299 || result < 200) goto opendir_errexit; + // tmp_line isn't relevant after the php_fopen_do_pasv(). + tmp_line[0] = '\0'; + /* set up the passive connection */ - portno = php_fopen_do_pasv(stream, ip, sizeof(ip), &hoststart TSRMLS_CC); + portno = php_fopen_do_pasv(stream, ip, sizeof(ip), &hoststart); if (!portno) { goto opendir_errexit; @@@ -725,25 -736,27 +727,27 @@@ goto opendir_errexit; } - result = GET_FTP_RESULT(stream); - if (result != 150 && result != 125) { - /* Could not retrieve or send the file - * this data will only be sent to us after connection on the data port was initiated.. - */ - php_stream_close(datastream); - datastream = NULL; - goto opendir_errexit; - } - php_stream_context_set(datastream, context); - if (use_ssl_on_data && (php_stream_xport_crypto_setup(datastream, - STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL TSRMLS_CC) < 0 || - php_stream_xport_crypto_enable(datastream, 1 TSRMLS_CC) < 0)) { + STREAM_CRYPTO_METHOD_SSLv23_CLIENT, NULL) < 0 || + php_stream_xport_crypto_enable(datastream, 1) < 0)) { - php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unable to activate SSL mode"); + php_stream_wrapper_log_error(wrapper, options, "Unable to activate SSL mode"); php_stream_close(datastream); datastream = NULL; + goto opendir_errexit; + } + + - php_stream_printf(stream TSRMLS_CC, "NLST %s\r\n", (resource->path != NULL ? resource->path : "/")); ++ php_stream_printf(stream, "NLST %s\r\n", (resource->path != NULL ? resource->path : "/")); + + result = GET_FTP_RESULT(stream); + if (result != 150 && result != 125) { + /* Could not retrieve or send the file + * this data will only be sent to us after connection on the data port was initiated. + */ + php_stream_close(datastream); + datastream = NULL; goto opendir_errexit; }