[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom php_dom.c

[Rob Richards]

rrichards               Mon Aug 14 11:29:16 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/dom    php_dom.c 
  Log:
  fix underlying issue for bug #38438
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.6&r2=1.73.2.12.2.7&diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.6 
php-src/ext/dom/php_dom.c:1.73.2.12.2.7
--- php-src/ext/dom/php_dom.c:1.73.2.12.2.6     Tue Jun  6 12:08:11 2006
+++ php-src/ext/dom/php_dom.c   Mon Aug 14 11:29:15 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_dom.c,v 1.73.2.12.2.6 2006/06/06 12:08:11 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.73.2.12.2.7 2006/08/14 11:29:15 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -228,7 +228,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;
@@ -239,7 +239,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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php