More static analyser fixes; version bump to 5.9.7.

balthisar · balthisar · commit 1213047d4241 · 2021-07-30T18:45:18.000-04:00
diff --git a/src/parser.c b/src/parser.c
@@ -4353,7 +4353,7 @@ Node* TY_(ParseHTML)( TidyDocImpl *doc, Node *html, GetTokenMode mode, Bool popS
                 }
 
                 /* Find and discard multiple <html> elements. */
-                if (node->tag == html->tag && node->type == StartTag)
+                if (html && (node->tag == html->tag) && (node->type == StartTag))
                 {
                     TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);
                     TY_(FreeNode)(doc, node);
@@ -5387,7 +5387,7 @@ Node* TY_(ParseNamespace)( TidyDocImpl* doc, Node *basenode, GetTokenMode mode,
                     TY_(FreeNode)(doc, node);
 
                     node = n;
-                    parent = node->parent;
+                    parent = node ? node->parent : NULL;
                 }
                 else
                 {
@@ -5401,7 +5401,7 @@ Node* TY_(ParseNamespace)( TidyDocImpl* doc, Node *basenode, GetTokenMode mode,
                 if (node == basenode)
                 {
                     lexer->istackbase = istackbase;
-                    assert(basenode->closed == yes);
+                    assert(basenode && basenode->closed == yes);
                     return NULL;
                 }
             }
@@ -6301,14 +6301,16 @@ void TY_(InsertNodeAtStart)(Node *element, Node *node)
 void TY_(InsertNodeAtEnd)(Node *element, Node *node)
 {
     node->parent = element;
-    node->prev = element->last;
+    node->prev = element ? element->last : NULL;
 
-    if (element->last != NULL)
+    if (element && element->last != NULL)
         element->last->next = node;
     else
-        element->content = node;
+        if (element)
+            element->content = node;
 
-    element->last = node;
+    if (element)
+        element->last = node;
 }
 
 
@@ -6319,16 +6321,17 @@ void TY_(InsertNodeBeforeElement)(Node *element, Node *node)
 {
     Node *parent;
 
-    parent = element->parent;
+    parent = element ? element->parent : NULL;
     node->parent = parent;
     node->next = element;
-    node->prev = element->prev;
-    element->prev = node;
+    node->prev = element ? element->prev : NULL;
+    if (element)
+        element->prev = node;
 
     if (node->prev)
         node->prev->next = node;
 
-    if (parent->content == element)
+    if (parent && parent->content == element)
         parent->content = node;
 }
 
diff --git a/version.txt b/version.txt
@@ -1,2 +1,2 @@
-5.9.6
+5.9.7
 2021.07.30

Original file line number	Diff line number	Diff line change
`@@ -4353,7 +4353,7 @@ Node* TY_(ParseHTML)( TidyDocImpl doc, Node html, GetTokenMode mode, Bool popS`
`4353`	`4353`	`}`
`4354`	`4354`
`4355`	`4355`	`/* Find and discard multiple <html> elements. */`
`4356`		`- if (node->tag == html->tag && node->type == StartTag)`
	`4356`	`+ if (html && (node->tag == html->tag) && (node->type == StartTag))`
`4357`	`4357`	`{`
`4358`	`4358`	`TY_(Report)(doc, html, node, DISCARDING_UNEXPECTED);`
`4359`	`4359`	`TY_(FreeNode)(doc, node);`
`@@ -5387,7 +5387,7 @@ Node* TY_(ParseNamespace)( TidyDocImpl* doc, Node *basenode, GetTokenMode mode,`
`5387`	`5387`	`TY_(FreeNode)(doc, node);`
`5388`	`5388`
`5389`	`5389`	`node = n;`
`5390`		`- parent = node->parent;`
	`5390`	`+ parent = node ? node->parent : NULL;`
`5391`	`5391`	`}`
`5392`	`5392`	`else`
`5393`	`5393`	`{`
`@@ -5401,7 +5401,7 @@ Node* TY_(ParseNamespace)( TidyDocImpl* doc, Node *basenode, GetTokenMode mode,`
`5401`	`5401`	`if (node == basenode)`
`5402`	`5402`	`{`
`5403`	`5403`	`lexer->istackbase = istackbase;`
`5404`		`- assert(basenode->closed == yes);`
	`5404`	`+ assert(basenode && basenode->closed == yes);`
`5405`	`5405`	`return NULL;`
`5406`	`5406`	`}`
`5407`	`5407`	`}`
`@@ -6301,14 +6301,16 @@ void TY_(InsertNodeAtStart)(Node element, Node node)`
`6301`	`6301`	`void TY_(InsertNodeAtEnd)(Node element, Node node)`
`6302`	`6302`	`{`
`6303`	`6303`	`node->parent = element;`
`6304`		`- node->prev = element->last;`
	`6304`	`+ node->prev = element ? element->last : NULL;`
`6305`	`6305`
`6306`		`- if (element->last != NULL)`
	`6306`	`+ if (element && element->last != NULL)`
`6307`	`6307`	`element->last->next = node;`
`6308`	`6308`	`else`
`6309`		`- element->content = node;`
	`6309`	`+ if (element)`
	`6310`	`+ element->content = node;`
`6310`	`6311`
`6311`		`- element->last = node;`
	`6312`	`+ if (element)`
	`6313`	`+ element->last = node;`
`6312`	`6314`	`}`
`6313`	`6315`
`6314`	`6316`
`@@ -6319,16 +6321,17 @@ void TY_(InsertNodeBeforeElement)(Node element, Node node)`
`6319`	`6321`	`{`
`6320`	`6322`	`Node *parent;`
`6321`	`6323`
`6322`		`- parent = element->parent;`
	`6324`	`+ parent = element ? element->parent : NULL;`
`6323`	`6325`	`node->parent = parent;`
`6324`	`6326`	`node->next = element;`
`6325`		`- node->prev = element->prev;`
`6326`		`- element->prev = node;`
	`6327`	`+ node->prev = element ? element->prev : NULL;`
	`6328`	`+ if (element)`
	`6329`	`+ element->prev = node;`
`6327`	`6330`
`6328`	`6331`	`if (node->prev)`
`6329`	`6332`	`node->prev->next = node;`
`6330`	`6333`
`6331`		`- if (parent->content == element)`
	`6334`	`+ if (parent && parent->content == element)`
`6332`	`6335`	`parent->content = node;`
`6333`	`6336`	`}`
`6334`	`6337`