emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #661 from htacg/issue-656

Browse source 
Issue #656 - protect against NULL node set in loop - closes #656
This commit is contained in:
Geoff McLane 2018-01-01 18:15:33 +01:00 committed by GitHub
parent f0438bd4b8 a0414d65a6
commit a111d7a969
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/clean.c
View file

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