rrichards Thu Dec 21 12:52:12 2006 UTC
Modified files:
/php-src/ext/dom domimplementation.c text.c
Log:
MFB: fix issues identitified by coverity
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementation.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/dom/domimplementation.c
diff -u php-src/ext/dom/domimplementation.c:1.21
php-src/ext/dom/domimplementation.c:1.22
--- php-src/ext/dom/domimplementation.c:1.21 Fri Dec 8 16:28:33 2006
+++ php-src/ext/dom/domimplementation.c Thu Dec 21 12:52:12 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: domimplementation.c,v 1.21 2006/12/08 16:28:33 rrichards Exp $ */
+/* $Id: domimplementation.c,v 1.22 2006/12/21 12:52:12 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -115,6 +115,11 @@
doctype = xmlCreateIntSubset(NULL, localname, pch1, pch2);
xmlFree(localname);
+ if (doctype == NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create
DocumentType");
+ RETURN_FALSE;
+ }
+
DOM_RET_OBJ(rv, (xmlNodePtr) doctype, &ret, NULL);
}
/* }}} end dom_domimplementation_create_document_type */
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.29&r2=1.30&diff_format=u
Index: php-src/ext/dom/text.c
diff -u php-src/ext/dom/text.c:1.29 php-src/ext/dom/text.c:1.30
--- php-src/ext/dom/text.c:1.29 Fri Dec 8 16:28:33 2006
+++ php-src/ext/dom/text.c Thu Dec 21 12:52:12 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: text.c,v 1.29 2006/12/08 16:28:33 rrichards Exp $ */
+/* $Id: text.c,v 1.30 2006/12/21 12:52:12 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -156,6 +156,10 @@
xmlFree(first);
xmlFree(second);
+ if (nnode == NULL) {
+ RETURN_FALSE;
+ }
+
if (node->parent != NULL) {
nnode->type = XML_ELEMENT_NODE;
xmlAddNextSibling(node, nnode);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
