com php-src: Fixed bug #70914 zend_throw_or_error() format string vulnerability: Zend/tests/bug709 14.phpt Zend/zend_execute_API.c
| From: | Anatol Belski | Date: | Sat, 14 Nov 2015 22:44:59 +0000 |
| Subject: | com php-src: Fixed bug #70914 zend_throw_or_error() format string vulnerability: Zend/tests/bug709 14.phpt Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89848@lists.php.net to get a copy of this message | ||
Commit: 617698dfe0f22bfa6041e6f0728136002d30d2bc
Author: Taoguang Chen <taoguangchen@icloud.com> Sat, 14 Nov 2015 23:44:59 +0100
Committer: Anatol Belski <ab@php.net> Sat, 14 Nov 2015 23:44:59 +0100
Parents: c2773ea02f94f4efa0be33f510088e8395caba1f
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=617698dfe0f22bfa6041e6f0728136002d30d2bc
Log:
Fixed bug #70914 zend_throw_or_error() format string vulnerability
Bugs:
https://bugs.php.net/70914
Changed paths:
A Zend/tests/bug70914.phpt
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/tests/bug70914.phpt b/Zend/tests/bug70914.phpt
new file mode 100644
index 0000000..7da64d7
--- /dev/null
+++ b/Zend/tests/bug70914.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #70895 null ptr deref and segfault with crafted callable
+--SKIPIF--
+<?php
+if (!extension_loaded("pdo_sqlite")) {
+ die("skip pdo_sqlite required");
+}
+?>
+--FILE--
+<?php
+
+$db = new PDO('sqlite::memory:');
+$st = $db->query('SELECT 1');
+$re = $st->fetchObject('%Z');
+?>
+--EXPECTREGEX--
+Fatal error: Class '%Z' not found in .+bug70914.php on line \d+
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 9d255ed..9979aac 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -220,7 +220,7 @@ static void zend_throw_or_error(int fetch_type, zend_class_entry *exception_ce,
if (fetch_type & ZEND_FETCH_CLASS_EXCEPTION) {
zend_throw_error(exception_ce, message);
} else {
- zend_error(E_ERROR, message);
+ zend_error(E_ERROR, "%s", message);
}
efree(message);