File 0001-Issue-656-protect-against-NULL-node-set-in... of Package tidy

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Issue-656-protect-against-NULL-node-set-in-loop.diff of Package tidy (Revision 54ca276697de5b7621be41dfd2c168d4)

Currently displaying revision 54ca276697de5b7621be41dfd2c168d4 , Show latest

From a0414d65a69927808240e41c1235145413978c43 Mon Sep 17 00:00:00 2001
From: Geoff McLane <ubuntu@geoffair.info>
Date: Sat, 16 Dec 2017 20:54:29 +0100
Subject: [PATCH] Issue #656 - protect against NULL node set in loop

---
 src/clean.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/clean.c b/src/clean.c
index de4caf5..e96dd3f 100644
--- a/src/clean.c
+++ b/src/clean.c
@@ -2211,8 +2211,10 @@ Bool TY_(TidyMetaCharset)(TidyDocImpl* doc)
     tidyBufAppend(&charsetString, "charset=", 8);
     tidyBufAppend(&charsetString, (char*)enc, TY_(tmbstrlen)(enc));
     tidyBufAppend(&charsetString, "\0", 1); /* zero terminate the buffer */
-                                            /* process the children of the head */
-    for (currentNode = head->content; currentNode; currentNode = currentNode->next)
+    /* process the children of the head */
+    /* Issue #656 - guard against 'currentNode' being set NULL in loop */
+    for (currentNode = head->content; currentNode; 
+        currentNode = (currentNode ? currentNode->next : NULL))
     {
         if (!nodeIsMETA(currentNode))
             continue;   /* not a meta node */
-- 
2.16.3

Places

File 0001-Issue-656-protect-against-NULL-node-set-in-loop.diff of Package tidy (Revision 54ca276697de5b7621be41dfd2c168d4)

Places