[tidyp] fix format string issues (https://github.com/w3c/tidy-html5/issues/11)

Paul Howarth pghmcfc at fedoraproject.org
Thu Nov 21 13:06:30 UTC 2013


commit 8a46944a65bb9a5fdf7c4db5b561f8351c406647
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Nov 21 12:48:40 2013 +0000

    fix format string issues (https://github.com/w3c/tidy-html5/issues/11)

 tidyp-1.02-format.patch |   72 +++++++++++++++++++++++++++++++++++++++++++++++
 tidyp.spec              |   14 +++++++--
 2 files changed, 83 insertions(+), 3 deletions(-)
---
diff --git a/tidyp-1.02-format.patch b/tidyp-1.02-format.patch
new file mode 100644
index 0000000..9a509cf
--- /dev/null
+++ b/tidyp-1.02-format.patch
@@ -0,0 +1,72 @@
+https://github.com/w3c/tidy-html5/issues/11
+https://github.com/w3c/tidy-html5/pull/12
+
+From 8727af8a7c8a2d11743bb6d35f07f4a21ade7266 Mon Sep 17 00:00:00 2001
+From: John Schember <john at nachtimwald.com>
+Date: Sun, 26 Feb 2012 11:53:53 -0500
+Subject: [PATCH] Fix format string warnings.
+
+---
+ src/localize.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/localize.c b/src/localize.c
+index 1b95923..9823f12 100644
+--- a/src/localize.c
++++ b/src/localize.c
+@@ -1373,14 +1373,14 @@ void TY_(ReportAccessWarning)( TidyDocImpl* doc, Node* node, uint code )
+ {
+     ctmbstr fmt = GetFormatFromCode(code);
+     doc->badAccess |= BA_WAI;
+-    messageNode( doc, TidyAccess, node, fmt );
++    messageNode( doc, TidyAccess, node, "%s", fmt );
+ }
+ 
+ void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code )
+ {
+     ctmbstr fmt = GetFormatFromCode(code);
+     doc->badAccess |= BA_WAI;
+-    messageNode( doc, TidyAccess, node, fmt );
++    messageNode( doc, TidyAccess, node, "%s", fmt );
+ }
+ 
+ #endif /* SUPPORT_ACCESSIBILITY_CHECKS */
+@@ -1399,7 +1399,7 @@ void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+     switch (code)
+     {
+     case NESTED_QUOTATION:
+-        messageNode(doc, TidyWarning, rpt, fmt);
++        messageNode(doc, TidyWarning, rpt, "%s", fmt);
+         break;
+ 
+     case OBSOLETE_ELEMENT:
+@@ -1480,7 +1480,7 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+     case INCONSISTENT_NAMESPACE:
+     case DOCTYPE_AFTER_TAGS:
+     case DTYPE_NOT_UPPER_CASE:
+-        messageNode(doc, TidyWarning, rpt, fmt);
++        messageNode(doc, TidyWarning, rpt, "%s", fmt);
+         break;
+ 
+     case COERCE_TO_ENDTAG:
+@@ -1499,7 +1499,7 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
+     case ENCODING_IO_CONFLICT:
+     case MISSING_DOCTYPE:
+     case SPACE_PRECEDING_XMLDECL:
+-        messageNode(doc, TidyWarning, node, fmt);
++        messageNode(doc, TidyWarning, node, "%s", fmt);
+         break;
+ 
+     case TRIM_EMPTY_ELEMENT:
+@@ -1548,7 +1548,7 @@ void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
+     {
+     case SUSPECTED_MISSING_QUOTE:
+     case DUPLICATE_FRAMESET:
+-        messageNode(doc, TidyError, rpt, fmt);
++        messageNode(doc, TidyError, rpt, "%s", fmt);
+         break;
+ 
+     case UNKNOWN_ELEMENT:
+-- 
+1.8.4
+
diff --git a/tidyp.spec b/tidyp.spec
index 22ef62e..c186706 100644
--- a/tidyp.spec
+++ b/tidyp.spec
@@ -1,7 +1,7 @@
 Summary:	Clean up and pretty-print HTML/XHTML/XML
 Name:		tidyp
 Version:	1.02
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	W3C
 Group:		Applications/Text
 Url:		http://www.tidyp.com/
@@ -9,6 +9,7 @@ Source0:	http://github.com/downloads/petdance/tidyp/tidyp-%{version}.tar.gz
 Patch0:		tidy-outfile-raw.patch
 Patch1:		tidyp-cflags.patch
 Patch2:		tidyp-1.04-aarch64.patch
+Patch3:		tidyp-1.02-format.patch
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 Requires:	libtidyp%{?_isa} = %{version}-%{release}
 
@@ -44,6 +45,10 @@ Development files for libtidyp.
 # Tweak config.guess and config.sub to add aarch64 support (#926635)
 %patch2
 
+# Fix format string issues
+# https://github.com/w3c/tidy-html5/issues/11
+%patch3 -p1
+
 # Fix permissions for debuginfo
 chmod -x src/{mappedio.*,version.h}
 
@@ -86,8 +91,11 @@ rm -rf %{buildroot}
 %exclude %{_libdir}/libtidyp.la
 
 %changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.02-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Thu Nov 21 2013 Paul Howarth <paul at city-fan.org> 1.02-11
+- fix format string issues (https://github.com/w3c/tidy-html5/issues/11)
+
+* Sun Aug  4 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 1.02-10
+- rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
 * Mon Mar 25 2013 Paul Howarth <paul at city-fan.org> 1.02-9
 - tweak config.guess and config.sub to add aarch64 support (#926635)


More information about the scm-commits mailing list