cvs: php-src /ext/dom php_dom.c
| From: | Rob Richards | Date: | Mon, 14 Aug 2006 11:29:49 +0000 |
| Subject: | cvs: php-src /ext/dom php_dom.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39956@lists.php.net to get a copy of this message | ||
rrichards Mon Aug 14 11:29:49 2006 UTC
Modified files:
/php-src/ext/dom php_dom.c
Log:
MFB: fix underlying issue for bug #38438
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/php_dom.c?r1=1.96&r2=1.97&diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.96 php-src/ext/dom/php_dom.c:1.97
--- php-src/ext/dom/php_dom.c:1.96 Fri Jun 2 21:55:26 2006
+++ php-src/ext/dom/php_dom.c Mon Aug 14 11:29:49 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.96 2006/06/02 21:55:26 tony2001 Exp $ */
+/* $Id: php_dom.c,v 1.97 2006/08/14 11:29:49 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -205,7 +205,7 @@
/* {{{ xmlNodePtr dom_object_get_node(dom_object *obj) */
PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj)
{
- if (obj->ptr != NULL) {
+ if (obj && obj->ptr != NULL) {
return ((php_libxml_node_ptr *)obj->ptr)->node;
} else {
return NULL;
@@ -216,7 +216,7 @@
/* {{{ dom_object *php_dom_object_get_data(xmlNodePtr obj) */
PHP_DOM_EXPORT dom_object *php_dom_object_get_data(xmlNodePtr obj)
{
- if (obj->_private != NULL) {
+ if (obj && obj->_private != NULL) {
return (dom_object *) ((php_libxml_node_ptr *) obj->_private)->_private;
} else {
return NULL;