diff --git a/0002-Issue-656-protect-against-NULL-node-set-in-loop.patch b/0002-Issue-656-protect-against-NULL-node-set-in-loop.patch deleted file mode 100644 index 2b87ed909c1a47fdfb1b7d7cea80e5a0d321305a..0000000000000000000000000000000000000000 --- a/0002-Issue-656-protect-against-NULL-node-set-in-loop.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a0414d65a69927808240e41c1235145413978c43 Mon Sep 17 00:00:00 2001 -From: Geoff McLane -Date: Sat, 16 Dec 2017 20:54:29 +0100 -Subject: [PATCH 02/12] 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.14.3 - diff --git a/tidy-html5-5.6.0.tar.gz b/tidy-html5-5.6.0.tar.gz deleted file mode 100644 index b94e0adb42bf04b438dd853767a1ca82ea1d75c4..0000000000000000000000000000000000000000 Binary files a/tidy-html5-5.6.0.tar.gz and /dev/null differ diff --git a/tidy-html5-5.7.28.tar.gz b/tidy-html5-5.7.28.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1516b97b71e7eb5d4e92ba5ace90a9be8a1fd7ec Binary files /dev/null and b/tidy-html5-5.7.28.tar.gz differ diff --git a/tidy.spec b/tidy.spec index dbedbb4b4bbcb9d38be25cefa3f8e028fb0c64b4..b5ccc719c29efa4da4ebab037cd5336892450ebf 100644 --- a/tidy.spec +++ b/tidy.spec @@ -2,16 +2,15 @@ %global upname tidy-html5 Name: tidy -Version: 5.6.0 -Release: 4 +Version: 5.7.28 +Release: 1 Summary: Utility to clean up and pretty print HTML/XHTML/XML License: W3C URL: http://www.html-tidy.org/ Source0: https://github.com/htacg/%{upname}/archive/%{version}.tar.gz#/%{upname}-%{version}.tar.gz -Patch0001: 0002-Issue-656-protect-against-NULL-node-set-in-loop.patch -Patch0002: fix-memleak-in-GetTokenFromStream.patch -Patch0003: free-attributes-before-return-NULL.patch +Patch0: fix-memleak-in-GetTokenFromStream.patch +Patch1: free-attributes-before-return-NULL.patch BuildRequires: gcc-c++ cmake gcc libxslt pkgconfig Provides: tidy-html5 = %{version}-%{release} @@ -82,6 +81,9 @@ ln -s tidyplatform.h $RPM_BUILD_ROOT%{_includedir}/platform.h %{_mandir}/* %changelog +* Tue Jan 26 2021 fuanan - 5.7.28-1 +- Update to version 5.7.28 + * Thu Nov 26 2020 yuboyun - 5.6.0-4 - Type:bugfix - ID:NA