iliaa Sun Aug 13 15:02:41 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/dom/tests bug38438.phpt
Modified files:
/php-src NEWS
/php-src/ext/dom nodelist.c
Log:
Fixed bug #38438 (DOMNodeList->item(0) segfault on empty NodeList)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.197&r2=1.2027.2.547.2.198&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.197 php-src/NEWS:1.2027.2.547.2.198
--- php-src/NEWS:1.2027.2.547.2.197 Fri Aug 11 17:43:03 2006
+++ php-src/NEWS Sun Aug 13 15:02:40 2006
@@ -37,6 +37,7 @@
- Fixed phpinfo() cutoff of variables at \0. (Ilia)
- Fixed a bug in the filter extension that prevented magic_quotes_gpc from
being applied when RAW filter is used. (Ilia)
+- FixedbBug #38438 (DOMNodeList->item(0) segfault on empty NodeList). (Ilia)
- Fixed bug #38431 (xmlrpc_get_type() crashes PHP on objects). (Tony)
- Fixed bug #38394 (PDO fails to recover from failed prepared statement
execution). (Ilia)
@@ -45,7 +46,7 @@
- Fixed bug #38354 (Unwanted reformatting of XML when using AsXML). (Christian)
- Fixed bug #38347 (Segmentation fault when using foreach with an
unknown/empty
SimpleXMLElement). (Tony)
-- Fixed bug #38322 (reading past array in sscanf() leads to arbitary code
+- Fixed bug #38322 (reading past array in sscanf() leads to arbitrary code
execution). (Tony)
- Fixed bug #38303 (spl_autoload_register() supress all errors silently).
(Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/nodelist.c?r1=1.17.2.2&r2=1.17.2.2.2.1&diff_format=u
Index: php-src/ext/dom/nodelist.c
diff -u php-src/ext/dom/nodelist.c:1.17.2.2
php-src/ext/dom/nodelist.c:1.17.2.2.2.1
--- php-src/ext/dom/nodelist.c:1.17.2.2 Sun Jan 1 12:50:06 2006
+++ php-src/ext/dom/nodelist.c Sun Aug 13 15:02:41 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nodelist.c,v 1.17.2.2 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: nodelist.c,v 1.17.2.2.2.1 2006/08/13 15:02:41 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -134,7 +134,7 @@
zval_copy_ctor(return_value);
return;
}
- } else {
+ } else if (objmap->baseobj) {
nodep =
dom_object_get_node(objmap->baseobj);
if (nodep) {
if (objmap->nodetype ==
XML_ATTRIBUTE_NODE || objmap->nodetype == XML_ELEMENT_NODE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug38438.phpt?view=markup&rev=1.1
Index: php-src/ext/dom/tests/bug38438.phpt
+++ php-src/ext/dom/tests/bug38438.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
