com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/ldap/ldap.c ext/mysqli/mysqli_api.c ext/mysqli/mysqli_nonapi.c ext/mysqlnd/mysqlnd.c
ext/pdo_mysql/mysql_driver.c

From: Date: Mon, 16 Nov 2015 09:59:46 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/ldap/ldap.c ext/mysqli/mysqli_api.c ext/mysqli/mysqli_nonapi.c ext/mysqlnd/mysqlnd.c
ext/pdo_mysql/mysql_driver.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89862@lists.php.net to get a copy of this message
Commit: 9134f9e98f6ccf8ed91cd1271fee7855062c07ff Author: Xinchen Hui <laruence@gmail.com> Mon, 16 Nov 2015 17:59:46 +0800 Parents: 0dce4bef7933920ef151f1f2ef7416f6a5da2afb 25439e939e8d6a86bcc1654221460851b43271d5 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9134f9e98f6ccf8ed91cd1271fee7855062c07ff Log: Merge branch 'PHP-5.6' into PHP-7.0 Conflicts: ext/mysql/php_mysql.c Changed paths: MM NEWS MM ext/ldap/ldap.c MM ext/mysqli/mysqli_api.c MM ext/mysqli/mysqli_nonapi.c MM ext/mysqlnd/mysqlnd.c MM ext/pdo_mysql/mysql_driver.c Diff: diff --cc NEWS index 5db4882,cb0b72f..41e34e9 --- a/NEWS +++ b/NEWS @@@ -1,18 -1,11 +1,22 @@@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? 2015, PHP 5.6.17 +?? ??? 2015, PHP 7.0.1 + +- Core: + . Fixed bug #70914 (zend_throw_or_error() format string vulnerability). + (Taoguang Chen) + . Fixed bug #70912 (Null ptr dereference instantiating class with invalid + array property). (Laruence) + . Fixed bug #70898, #70895 (null ptr deref and segfault with crafted callable). + (Anatol, Laruence) + - Mysqlnd: + . Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction). + (Laruence) + +- OCI8: + . Fixed memory leak with LOBs. (Senthil) + - SOAP: . Fixed bug #70900 (SoapClient systematic out of memory error). (Dmitry) diff --cc ext/mysqli/mysqli_api.c index ce33fa8,47fcb9e..20f2229 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@@ -1765,17 -1813,18 +1765,18 @@@ PHP_FUNCTION(mysqli_options { MY_MYSQL *mysql; zval *mysql_link = NULL; - zval **mysql_value; - long mysql_option; + zval *mysql_value; + zend_long mysql_option; unsigned int l_value; - long ret; + zend_long ret; int expected_type; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "OlZ", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Olz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_INITIALIZED); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED); + #if !defined(MYSQLI_USE_MYSQLND) #if PHP_API_VERSION < 20100412 if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode)) { #else @@@ -1785,8 -1834,9 +1786,9 @@@ RETURN_FALSE; } } + #endif expected_type = mysqli_options_get_option_zval_type(mysql_option); - if (expected_type != Z_TYPE_PP(mysql_value)) { + if (expected_type != Z_TYPE_P(mysql_value)) { switch (expected_type) { case IS_STRING: convert_to_string_ex(mysql_value);

« previous php.cvs (#89862) next »