[libxml2/ddkilzer/add-fuzzing-asserts-to-xmlSetTreeDoc] Add fuzzing asserts to xmlSetTreeDoc()
- From: David Kilzer <ddkilzer src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libxml2/ddkilzer/add-fuzzing-asserts-to-xmlSetTreeDoc] Add fuzzing asserts to xmlSetTreeDoc()
- Date: Wed, 25 May 2022 17:15:02 +0000 (UTC)
commit 300e19932f273f871a88499f030ebbc1ac0ddfb0
Author: David Kilzer <ddkilzer apple com>
Date: Sat Mar 19 17:17:40 2022 -0700
Add fuzzing asserts to xmlSetTreeDoc()
* tree.c:
(xmlSetTreeDoc):
- When xmlSetTreeDoc() has to change documents, the calling code
probably has a bug, so assert when those conditions are hit.
This is a follow-up to commit 4bc3ebf3.
tree.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
---
diff --git a/tree.c b/tree.c
index 99eef30e..7baedef5 100644
--- a/tree.c
+++ b/tree.c
@@ -18,6 +18,7 @@
#define IN_LIBXML
#include "libxml.h"
+#include <assert.h>
#include <string.h> /* for memset() only ! */
#include <stddef.h>
#include <limits.h>
@@ -2850,6 +2851,10 @@ xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) {
xmlRemoveID(tree->doc, prop);
}
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+ if (prop->doc)
+ assert(xmlDictOwns(prop->doc->dict, prop->name) != 1);
+#endif
if (prop->doc != doc) {
xmlDictPtr oldPropDict = prop->doc ? prop->doc->dict : NULL;
prop->name = _copyStringForNewDictIfNeeded(oldPropDict, newDict, prop->name);
@@ -2884,6 +2889,13 @@ xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) {
xmlSetListDoc(tree->children, doc);
}
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+ if (tree->doc) {
+ assert(xmlDictOwns(tree->doc->dict, tree->name) != 1);
+ assert(xmlDictOwns(tree->doc->dict, tree->content) != 1);
+ }
+ assert(tree->ns == NULL);
+#endif
tree->name = _copyStringForNewDictIfNeeded(oldTreeDict, newDict, tree->name);
tree->content = (xmlChar *)_copyStringForNewDictIfNeeded(oldTreeDict, NULL, tree->content);
/* FIXME: tree->ns should be updated as in xmlStaticCopyNode(). */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]