cvs: php-src /ext/dom attr.c characterdata.c document.c documenttype.c element.c entity.c node.c notation.c processinginstruction.c text.c

rrichards Mon Feb 16 08:07:09 2004 EDT Modified files: /php-src/ext/dom text.c processinginstruction.c notation.c node.c entity.c element.c documenttype.c document.c characterdata.c attr.c Log: issue warning if object is in invalid state when dealing with properties

http://cvs.php.net/diff.php/php-src/ext/dom/text.c?r1=1.16&r2=1.17&ty=u Index: php-src/ext/dom/text.c diff -u php-src/ext/dom/text.c:1.16 php-src/ext/dom/text.c:1.17 --- php-src/ext/dom/text.c:1.16 Sun Feb 15 05:54:37 2004 +++ php-src/ext/dom/text.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: text.c,v 1.16 2004/02/15 10:54:37 rrichards Exp $ */ +/* $Id: text.c,v 1.17 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -85,6 +85,11 @@ node = dom_object_get_node(obj); + if (node == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); wholetext = xmlNodeListGetString(node->doc, node, 1); ZVAL_STRING(*retval, wholetext, 1); http://cvs.php.net/diff.php/php-src/ext/dom/processinginstruction.c?r1=1.10&r2=1.11&ty=u Index: php-src/ext/dom/processinginstruction.c diff -u php-src/ext/dom/processinginstruction.c:1.10 php-src/ext/dom/processinginstruction.c:1.11 --- php-src/ext/dom/processinginstruction.c:1.10 Sun Feb 15 12:07:34 2004 +++ php-src/ext/dom/processinginstruction.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: processinginstruction.c,v 1.10 2004/02/15 17:07:34 rrichards Exp $ */ +/* $Id: processinginstruction.c,v 1.11 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -86,6 +86,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); ZVAL_STRING(*retval, (char *) (nodep->name), 1); @@ -108,6 +113,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); @@ -128,6 +138,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (newval->type != IS_STRING) { if(newval->refcount > 1) { value_copy = *newval; http://cvs.php.net/diff.php/php-src/ext/dom/notation.c?r1=1.5&r2=1.6&ty=u Index: php-src/ext/dom/notation.c diff -u php-src/ext/dom/notation.c:1.5 php-src/ext/dom/notation.c:1.6 --- php-src/ext/dom/notation.c:1.5 Thu Jan 8 03:15:17 2004 +++ php-src/ext/dom/notation.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: notation.c,v 1.5 2004/01/08 08:15:17 andi Exp $ */ +/* $Id: notation.c,v 1.6 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -51,6 +51,12 @@ xmlNotationPtr nodep; nodep = (xmlNotationPtr) dom_object_get_node(obj); + + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (nodep->PublicID) { ZVAL_STRING(*retval, (char *) (nodep->PublicID), 1); @@ -75,6 +81,12 @@ xmlNotationPtr nodep; nodep = (xmlNotationPtr) dom_object_get_node(obj); + + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (nodep->SystemID) { ZVAL_STRING(*retval, (char *) (nodep->PublicID), 1); http://cvs.php.net/diff.php/php-src/ext/dom/node.c?r1=1.23&r2=1.24&ty=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.23 php-src/ext/dom/node.c:1.24 --- php-src/ext/dom/node.c:1.23 Sun Feb 15 09:05:17 2004 +++ php-src/ext/dom/node.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c,v 1.23 2004/02/15 14:05:17 rrichards Exp $ */ +/* $Id: node.c,v 1.24 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -86,6 +86,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + switch (nodep->type) { case XML_ATTRIBUTE_NODE: case XML_ELEMENT_NODE: @@ -170,6 +175,12 @@ char *str = NULL; nodep = dom_object_get_node(obj); + + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + /* Access to Element node is implemented as a convience method */ switch (nodep->type) { case XML_ATTRIBUTE_NODE: @@ -209,6 +220,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + /* Access to Element node is implemented as a convience method */ switch (nodep->type) { case XML_ELEMENT_NODE: @@ -255,6 +271,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); /* Specs dictate that they are both type XML_DOCUMENT_TYPE_NODE */ @@ -283,6 +304,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + nodeparent = nodep->parent; if (!nodeparent) { return FAILURE; @@ -313,6 +339,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (dom_node_children_valid(nodep) == FAILURE) { @@ -342,6 +373,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (dom_node_children_valid(nodep) == SUCCESS) { first = nodep->children; } @@ -375,6 +411,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (dom_node_children_valid(nodep) == SUCCESS) { last = nodep->last; } @@ -408,6 +449,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + prevsib = nodep->prev; if (!prevsib) { return FAILURE; @@ -438,6 +484,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + nextsib = nodep->next; if (!nextsib) { return FAILURE; @@ -468,6 +519,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (nodep->type == XML_ELEMENT_NODE) { @@ -498,6 +554,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (nodep->type == XML_DOCUMENT_NODE || nodep->type == XML_HTML_DOCUMENT_NODE) { ALLOC_ZVAL(*retval); ZVAL_NULL(*retval); @@ -534,6 +595,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + switch (nodep->type) { case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: @@ -575,6 +641,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + switch (nodep->type) { case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: @@ -611,6 +682,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + switch (nodep->type) { case XML_ELEMENT_NODE: case XML_ATTRIBUTE_NODE: @@ -682,6 +758,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (nodep->type == XML_ELEMENT_NODE || nodep->type == XML_ATTRIBUTE_NODE || nodep->type == XML_NAMESPACE_DECL) { @@ -709,6 +790,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); baseuri = xmlNodeGetBase(nodep->doc, nodep); @@ -738,6 +824,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + str = xmlNodeGetContent(nodep); ALLOC_ZVAL(*retval); http://cvs.php.net/diff.php/php-src/ext/dom/entity.c?r1=1.5&r2=1.6&ty=u Index: php-src/ext/dom/entity.c diff -u php-src/ext/dom/entity.c:1.5 php-src/ext/dom/entity.c:1.6 --- php-src/ext/dom/entity.c:1.5 Thu Jan 8 03:15:16 2004 +++ php-src/ext/dom/entity.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: entity.c,v 1.5 2004/01/08 08:15:16 andi Exp $ */ +/* $Id: entity.c,v 1.6 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -52,6 +52,11 @@ nodep = (xmlEntity *) dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (nodep->etype != XML_EXTERNAL_GENERAL_UNPARSED_ENTITY) { ZVAL_NULL(*retval); @@ -77,6 +82,11 @@ nodep = (xmlEntity *) dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (nodep->etype != XML_EXTERNAL_GENERAL_UNPARSED_ENTITY) { ZVAL_NULL(*retval); @@ -103,6 +113,11 @@ nodep = (xmlEntity *) dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (nodep->etype != XML_EXTERNAL_GENERAL_UNPARSED_ENTITY) { ZVAL_NULL(*retval); http://cvs.php.net/diff.php/php-src/ext/dom/element.c?r1=1.24&r2=1.25&ty=u Index: php-src/ext/dom/element.c diff -u php-src/ext/dom/element.c:1.24 php-src/ext/dom/element.c:1.25 --- php-src/ext/dom/element.c:1.24 Sun Feb 15 09:05:17 2004 +++ php-src/ext/dom/element.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: element.c,v 1.24 2004/02/15 14:05:17 rrichards Exp $ */ +/* $Id: element.c,v 1.25 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -109,6 +109,12 @@ xmlChar *qname; nodep = dom_object_get_node(obj); + + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); ns = nodep->ns; if (ns != NULL && ns->prefix) { http://cvs.php.net/diff.php/php-src/ext/dom/documenttype.c?r1=1.10&r2=1.11&ty=u Index: php-src/ext/dom/documenttype.c diff -u php-src/ext/dom/documenttype.c:1.10 php-src/ext/dom/documenttype.c:1.11 --- php-src/ext/dom/documenttype.c:1.10 Sun Feb 15 12:07:34 2004 +++ php-src/ext/dom/documenttype.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: documenttype.c,v 1.10 2004/02/15 17:07:34 rrichards Exp $ */ +/* $Id: documenttype.c,v 1.11 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -50,6 +50,12 @@ xmlDtdPtr dtdptr; dtdptr = (xmlDtdPtr) dom_object_get_node(obj); + + if (dtdptr == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); ZVAL_STRING(*retval, (char *) (dtdptr->name), 1); @@ -73,6 +79,11 @@ doctypep = (xmlDtdPtr) dom_object_get_node(obj); + if (doctypep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + MAKE_STD_ZVAL(*retval); php_dom_create_interator(*retval, DOM_NAMEDNODEMAP TSRMLS_CC); @@ -101,6 +112,11 @@ doctypep = (xmlDtdPtr) dom_object_get_node(obj); + if (doctypep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + MAKE_STD_ZVAL(*retval); php_dom_create_interator(*retval, DOM_NAMEDNODEMAP TSRMLS_CC); @@ -127,6 +143,11 @@ dtdptr = (xmlDtdPtr) dom_object_get_node(obj); + if (dtdptr == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (dtdptr->ExternalID) { ZVAL_STRING(*retval, (char *) (dtdptr->ExternalID), 1); @@ -152,6 +173,11 @@ dtdptr = (xmlDtdPtr) dom_object_get_node(obj); + if (dtdptr == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (dtdptr->SystemID) { ZVAL_STRING(*retval, (char *) (dtdptr->SystemID), 1); @@ -180,6 +206,11 @@ dtdptr = (xmlDtdPtr) dom_object_get_node(obj); + if (dtdptr == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if (dtdptr->doc != NULL && ((intsubset = dtdptr->doc->intSubset) != NULL)) { http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.48&r2=1.49&ty=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.48 php-src/ext/dom/document.c:1.49 --- php-src/ext/dom/document.c:1.48 Sun Feb 15 12:07:34 2004 +++ php-src/ext/dom/document.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.48 2004/02/15 17:07:34 rrichards Exp $ */ +/* $Id: document.c,v 1.49 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -101,6 +101,11 @@ docp = (xmlDocPtr) dom_object_get_node(obj); + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + dtdptr = xmlGetIntSubset(docp); if (!dtdptr) { return FAILURE; @@ -148,6 +153,11 @@ docp = (xmlDocPtr) dom_object_get_node(obj); + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + root = xmlDocGetRootElement(docp); if (!root) { return FAILURE; @@ -195,6 +205,12 @@ char *encoding; docp = (xmlDocPtr) dom_object_get_node(obj); + + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + encoding = (char *) docp->encoding; ALLOC_ZVAL(*retval); @@ -215,6 +231,11 @@ docp = (xmlDocPtr) dom_object_get_node(obj); + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (newval->type != IS_STRING) { if(newval->refcount > 1) { value_copy = *newval; @@ -258,6 +279,12 @@ int standalone; docp = (xmlDocPtr) dom_object_get_node(obj); + + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); standalone = docp->standalone; ZVAL_BOOL(*retval, standalone); @@ -273,6 +300,11 @@ docp = (xmlDocPtr) dom_object_get_node(obj); + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if(newval->refcount > 1) { value_copy = *newval; zval_copy_ctor(&value_copy); @@ -313,6 +345,12 @@ char *version; docp = (xmlDocPtr) dom_object_get_node(obj); + + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + version = (char *) docp->version; ALLOC_ZVAL(*retval); @@ -331,6 +369,12 @@ xmlDoc *docp; docp = (xmlDocPtr) dom_object_get_node(obj); + + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (docp->version != NULL) { xmlFree((xmlChar *) docp->version ); } @@ -626,6 +670,11 @@ docp = (xmlDocPtr) dom_object_get_node(obj); + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); url = (char *) docp->URL; if (url != NULL) { @@ -643,6 +692,12 @@ xmlDoc *docp; docp = (xmlDocPtr) dom_object_get_node(obj); + + if (docp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (docp->URL != NULL) { xmlFree((xmlChar *) docp->URL); } @@ -1025,8 +1080,6 @@ DOM_GET_OBJ(docp, id, xmlDocPtr, intern); - DOM_GET_THIS_OBJ(docp, id, xmlDocPtr, intern); - errorcode = dom_check_qname(name, &localname, &prefix, uri_len, name_len); if (errorcode == 0) { http://cvs.php.net/diff.php/php-src/ext/dom/characterdata.c?r1=1.11&r2=1.12&ty=u Index: php-src/ext/dom/characterdata.c diff -u php-src/ext/dom/characterdata.c:1.11 php-src/ext/dom/characterdata.c:1.12 --- php-src/ext/dom/characterdata.c:1.11 Sun Feb 15 13:57:10 2004 +++ php-src/ext/dom/characterdata.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: characterdata.c,v 1.11 2004/02/15 18:57:10 rrichards Exp $ */ +/* $Id: characterdata.c,v 1.12 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -56,6 +56,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); if ((content = xmlNodeGetContent(nodep)) != NULL) { @@ -75,6 +80,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (newval->type != IS_STRING) { if(newval->refcount > 1) { value_copy = *newval; @@ -108,6 +118,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); content = xmlNodeGetContent(nodep); http://cvs.php.net/diff.php/php-src/ext/dom/attr.c?r1=1.11&r2=1.12&ty=u Index: php-src/ext/dom/attr.c diff -u php-src/ext/dom/attr.c:1.11 php-src/ext/dom/attr.c:1.12 --- php-src/ext/dom/attr.c:1.11 Sun Feb 15 13:57:10 2004 +++ php-src/ext/dom/attr.c Mon Feb 16 08:06:33 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: attr.c,v 1.11 2004/02/15 18:57:10 rrichards Exp $ */ +/* $Id: attr.c,v 1.12 2004/02/16 13:06:33 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -92,6 +92,12 @@ xmlAttrPtr attrp; attrp = (xmlAttrPtr) dom_object_get_node(obj); + + if (attrp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); ZVAL_STRING(*retval, (char *) (attrp->name), 1); @@ -131,6 +137,11 @@ attrp = (xmlAttrPtr) dom_object_get_node(obj); + if (attrp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + ALLOC_ZVAL(*retval); @@ -152,6 +163,11 @@ attrp = (xmlAttrPtr) dom_object_get_node(obj); + if (attrp == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + if (attrp->children) { node_list_unlink(attrp->children TSRMLS_CC); } @@ -190,6 +206,11 @@ nodep = dom_object_get_node(obj); + if (nodep == NULL) { + php_dom_throw_error(INVALID_STATE_ERR, 0 TSRMLS_CC); + return FAILURE; + } + nodeparent = nodep->parent; if (!nodeparent) { return FAILURE;