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

[Michael Wallner]

mike            Fri Feb 24 10:24:43 2006 UTC

  Modified files:              
    /php-src/ext/dom    domimplementation.c 
  Log:
  - MF51: fix crash in DOMImplementation::createDocumentType("name:")
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/domimplementation.c?r1=1.18&r2=1.19&diff_format=u
Index: php-src/ext/dom/domimplementation.c
diff -u php-src/ext/dom/domimplementation.c:1.18 
php-src/ext/dom/domimplementation.c:1.19
--- php-src/ext/dom/domimplementation.c:1.18    Mon Feb 13 10:23:57 2006
+++ php-src/ext/dom/domimplementation.c Fri Feb 24 10:24:43 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: domimplementation.c,v 1.18 2006/02/13 10:23:57 dmitry Exp $ */
+/* $Id: domimplementation.c,v 1.19 2006/02/24 10:24:43 mike Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -92,7 +92,7 @@
                pch2 = systemid;
 
        uri = xmlParseURI(name);
-       if (uri->opaque != NULL) {
+       if (uri != NULL && uri->opaque != NULL) {
                localname = xmlStrdup(uri->opaque);
                if (xmlStrchr(localname, (xmlChar) ':') != NULL) {
                        php_dom_throw_error(NAMESPACE_ERR, 1 TSRMLS_CC);
@@ -108,7 +108,9 @@
        php_dom_throw_error(INVALID_CHARACTER_ERR, TSRMLS_CC);
        */
 
-       xmlFreeURI(uri);
+       if (uri) {
+               xmlFreeURI(uri);
+       }
 
        doctype = xmlCreateIntSubset(NULL, localname, pch1, pch2);
        xmlFree(localname);

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