!18 Update to version 5.7.28
From: @fly_fzc Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
cfa091fb8a
@ -1,29 +0,0 @@
|
|||||||
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 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
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
tidy-html5-5.7.28.tar.gz
Normal file
BIN
tidy-html5-5.7.28.tar.gz
Normal file
Binary file not shown.
12
tidy.spec
12
tidy.spec
@ -2,16 +2,15 @@
|
|||||||
%global upname tidy-html5
|
%global upname tidy-html5
|
||||||
|
|
||||||
Name: tidy
|
Name: tidy
|
||||||
Version: 5.6.0
|
Version: 5.7.28
|
||||||
Release: 4
|
Release: 1
|
||||||
Summary: Utility to clean up and pretty print HTML/XHTML/XML
|
Summary: Utility to clean up and pretty print HTML/XHTML/XML
|
||||||
License: W3C
|
License: W3C
|
||||||
URL: http://www.html-tidy.org/
|
URL: http://www.html-tidy.org/
|
||||||
Source0: https://github.com/htacg/%{upname}/archive/%{version}.tar.gz#/%{upname}-%{version}.tar.gz
|
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
|
Patch0: fix-memleak-in-GetTokenFromStream.patch
|
||||||
Patch0002: fix-memleak-in-GetTokenFromStream.patch
|
Patch1: free-attributes-before-return-NULL.patch
|
||||||
Patch0003: free-attributes-before-return-NULL.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc-c++ cmake gcc libxslt pkgconfig
|
BuildRequires: gcc-c++ cmake gcc libxslt pkgconfig
|
||||||
Provides: tidy-html5 = %{version}-%{release}
|
Provides: tidy-html5 = %{version}-%{release}
|
||||||
@ -82,6 +81,9 @@ ln -s tidyplatform.h $RPM_BUILD_ROOT%{_includedir}/platform.h
|
|||||||
%{_mandir}/*
|
%{_mandir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 26 2021 fuanan <fuanan3@huawei.com> - 5.7.28-1
|
||||||
|
- Update to version 5.7.28
|
||||||
|
|
||||||
* Thu Nov 26 2020 yuboyun <yuboyun@huawei.com> - 5.6.0-4
|
* Thu Nov 26 2020 yuboyun <yuboyun@huawei.com> - 5.6.0-4
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user