Properly handle nodes being replaced when fixing comments.

libxmq · Dec 18, 2023 · ae22cbd · ae22cbd
1 parent f519c72
commit ae22cbd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/dist/xmq.c b/dist/xmq.c
@@ -4987,8 +4987,9 @@ void xmq_fixup_html_before_writeout(XMQDoc *doq)
 
     while (i)
     {
+        xmlNode *next = xml_next_sibling(i); // i might be freed in fixup_html.
         fixup_html(doq, i, false);
-        i = xml_next_sibling(i);
+        i = next;
     }
 }
 
@@ -5015,7 +5016,6 @@ void fixup_comments(XMQDoc *doq, xmlNode *node)
     while (i)
     {
         xmlNode *next = xml_next_sibling(i); // i might be freed in trim.
-
         fixup_comments(doq, i);
         i = next;
     }
@@ -5028,8 +5028,9 @@ void xmq_fixup_comments_after_readin(XMQDoc *doq)
 
     while (i)
     {
+        xmlNode *next = xml_next_sibling(i); // i might be freed in fixup_comments.
         fixup_comments(doq, i);
-        i = xml_next_sibling(i);
+        i = next;
     }
 }
 

diff --git a/src/main/c/xmq.c b/src/main/c/xmq.c
@@ -4211,8 +4211,9 @@ void xmq_fixup_html_before_writeout(XMQDoc *doq)
 
     while (i)
     {
+        xmlNode *next = xml_next_sibling(i); // i might be freed in fixup_html.
         fixup_html(doq, i, false);
-        i = xml_next_sibling(i);
+        i = next;
     }
 }
 
@@ -4239,7 +4240,6 @@ void fixup_comments(XMQDoc *doq, xmlNode *node)
     while (i)
     {
         xmlNode *next = xml_next_sibling(i); // i might be freed in trim.
-
         fixup_comments(doq, i);
         i = next;
     }
@@ -4252,8 +4252,9 @@ void xmq_fixup_comments_after_readin(XMQDoc *doq)
 
     while (i)
     {
+        xmlNode *next = xml_next_sibling(i); // i might be freed in fixup_comments.
         fixup_comments(doq, i);
-        i = xml_next_sibling(i);
+        i = next;
     }
 }