[PHP-CVS] com php-src: Make zval2myslqnd implementations aware of inheritance: ext/mysqli/mysqli.c ext/pdo_mysql/pdo_mysql.c
Commit:d3a4af4db8d44f3d4a353589857c3c016ba8beda
Author:Johannes Schlüter johan...@php.net Tue, 16 Jul 2013
13:52:57 +0200
Parents: bcb39d9c6a0b0a16c9bda5a661a0897e96de09a5
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=d3a4af4db8d44f3d4a353589857c3c016ba8beda
Log:
Make zval2myslqnd implementations aware of inheritance
Changed paths:
M ext/mysqli/mysqli.c
M ext/pdo_mysql/pdo_mysql.c
Diff:
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 45e39d0..84f77d0 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -531,7 +531,7 @@ PHP_MYSQLI_EXPORT(zend_object_value)
mysqli_objects_new(zend_class_entry *class_
#include ext/mysqlnd/mysqlnd_reverse_api.h
static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC)
{
- if (Z_TYPE_P(zv) == IS_OBJECT Z_OBJCE_P(zv) ==
mysqli_link_class_entry) {
+ if (Z_TYPE_P(zv) == IS_OBJECT instanceof_function(Z_OBJCE_P(zv),
mysqli_link_class_entry) TSRMLS_CC) {
MY_MYSQL * mysql;
MYSQLI_RESOURCE * my_res;
mysqli_object * intern = (mysqli_object
*)zend_object_store_get_object(zv TSRMLS_CC);
diff --git a/ext/pdo_mysql/pdo_mysql.c b/ext/pdo_mysql/pdo_mysql.c
index 1dbb30f..0d4e525 100644
--- a/ext/pdo_mysql/pdo_mysql.c
+++ b/ext/pdo_mysql/pdo_mysql.c
@@ -61,7 +61,7 @@ ZEND_DECLARE_MODULE_GLOBALS(pdo_mysql)
#include ext/mysqlnd/mysqlnd_reverse_api.h
static MYSQLND * pdo_mysql_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC)
{
- if (Z_TYPE_P(zv) == IS_OBJECT Z_OBJCE_P(zv) == php_pdo_get_dbh_ce())
{
+ if (Z_TYPE_P(zv) == IS_OBJECT instanceof_function(Z_OBJCE_P(zv),
php_pdo_get_dbh_ce() TSRMLS_CC)) {
pdo_dbh_t * dbh = zend_object_store_get_object(zv TSRMLS_CC);
if (!dbh || dbh-driver != pdo_mysql_driver) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c ext/pdo_mysql/pdo_mysql.c
Commit:e1a0c90b8b032ce8a677b5aeca9920ceac41fc72 Author:Johannes Schlüter johan...@php.net Tue, 16 Jul 2013 13:55:32 +0200 Parents: 54b740a7e1ceea80690d47833a3fe667ce839522 d3a4af4db8d44f3d4a353589857c3c016ba8beda Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e1a0c90b8b032ce8a677b5aeca9920ceac41fc72 Log: Merge branch 'PHP-5.4' into PHP-5.5 Changed paths: MM ext/mysqli/mysqli.c MM ext/pdo_mysql/pdo_mysql.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: added sapi check for dl() test: ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
Commit:135f81c5aede4078d0f4f740f01cdf013e805ed4
Author:Anatol Belski a...@php.net Tue, 16 Jul 2013 15:42:38 +0200
Parents: d3a4af4db8d44f3d4a353589857c3c016ba8beda
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=135f81c5aede4078d0f4f740f01cdf013e805ed4
Log:
added sapi check for dl() test
Changed paths:
M ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
Diff:
diff --git a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
index e242d45..c53b515 100644
--- a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
+++ b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
@@ -1,5 +1,12 @@
--TEST--
dl() filename length checks (CVE-2007-4887)
+--SKIPIF--
+?php
+$enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
+if (!in_array(php_sapi_name(), $enabled_sapi)) {
+ die('skip dl() is not enabled for ' . php_sapi_name());
+}
+?
--INI--
enable_dl=1
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/mysqli/mysqli.c
Commit:fd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9 Author:Anatol Belski a...@php.net Tue, 16 Jul 2013 18:05:45 +0200 Parents: f37ac6f5912d605633e0abf6310255b9d851d078 bb6d74918ea66099cf36c5509e844df0f15a7515 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd5cdf89a8ddde4c5a9cf4cfb95415de07caf7b9 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: fix TS build Changed paths: MM ext/mysqli/mysqli.c Diff: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: fix TS build: ext/mysqli/mysqli.c
Commit:bb6d74918ea66099cf36c5509e844df0f15a7515
Author:Anatol Belski a...@php.net Tue, 16 Jul 2013 18:05:14 +0200
Parents: 135f81c5aede4078d0f4f740f01cdf013e805ed4
Branches: PHP-5.4 PHP-5.5 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=bb6d74918ea66099cf36c5509e844df0f15a7515
Log:
fix TS build
Changed paths:
M ext/mysqli/mysqli.c
Diff:
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 84f77d0..2710b9d 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -531,7 +531,7 @@ PHP_MYSQLI_EXPORT(zend_object_value)
mysqli_objects_new(zend_class_entry *class_
#include ext/mysqlnd/mysqlnd_reverse_api.h
static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval * zv TSRMLS_DC)
{
- if (Z_TYPE_P(zv) == IS_OBJECT instanceof_function(Z_OBJCE_P(zv),
mysqli_link_class_entry) TSRMLS_CC) {
+ if (Z_TYPE_P(zv) == IS_OBJECT instanceof_function(Z_OBJCE_P(zv),
mysqli_link_class_entry TSRMLS_CC)) {
MY_MYSQL * mysql;
MYSQLI_RESOURCE * my_res;
mysqli_object * intern = (mysqli_object
*)zend_object_store_get_object(zv TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: add news for xml fix: NEWS
Commit:eb8c15b57375ec6755c406aa9ce7a5d9145ab1c1 Author:Stanislav Malyshev s...@php.net Tue, 16 Jul 2013 15:38:37 -0700 Parents: bb6d74918ea66099cf36c5509e844df0f15a7515 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb8c15b57375ec6755c406aa9ce7a5d9145ab1c1 Log: add news for xml fix Changed paths: M NEWS Diff: diff --git a/NEWS b/NEWS index 52eab40..fff15a7 100644 --- a/NEWS +++ b/NEWS @@ -87,6 +87,9 @@ PHP NEWS . Fixed bug #60560 (SplFixedArray un-/serialize, getSize(), count() return 0, keys are strings). (Adam) +- XML: + . Fixed bug #65236 (heap corruption in xml parser, CVE-2013-4113). (Rob) + 04 Jul 2013, PHP 5.4.17 - Core: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
