[PHP-CVS] cvs: php-src /ext/dom xpath.c

[Rob Richards]

rrichards               Sun Oct  5 09:14:22 2003 EDT

  Modified files:              
    /php-src/ext/dom    xpath.c 
  Log:
  fix segfault if xpath expression string is invalid
  
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.5 php-src/ext/dom/xpath.c:1.6
--- php-src/ext/dom/xpath.c:1.5 Mon Sep 29 07:43:26 2003
+++ php-src/ext/dom/xpath.c     Sun Oct  5 09:14:21 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: xpath.c,v 1.5 2003/09/29 11:43:26 rrichards Exp $ */
+/* $Id: xpath.c,v 1.6 2003/10/05 13:14:21 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -197,6 +197,9 @@
                ctxp->nsNr = 0;
        }
 
+       if (! xpathobjp) {
+               RETURN_FALSE;
+       }
        if (xpathobjp->type ==  XPATH_NODESET) {
                int i;
                xmlNodeSetPtr nodesetp;

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