c_cpp/tinyxml
SHA256
8
0
Fork 0
forked from pool/tinyxml
Code Pull Requests Activity

Accepting request 1133455 from home:aschnell:branches:devel:libraries:c_c++

Browse Source 
- avoid assertion on certain malformed input including null-byte
  (bsc#1218040)
- added tinyxml-null-byte-assert.patch

OBS-URL: https://build.opensuse.org/request/show/1133455
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/tinyxml?expand=0&rev=21
This commit is contained in:
Dirk Mueller
2023-12-16 19:11:15 +00:00
committed by Git OBS Bridge
parent ee0de8fc0c
commit 399e6d2e69
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tinyxml-null-byte-assert.patch Normal file
View File

@@ -0,0 +1,12 @@
--- a/tinyxmlparser.cpp 2011-05-15 04:24:57.000000000 +0200
+++ b/tinyxmlparser.cpp 2023-12-15 12:06:34.919095166 +0100
@@ -1600,6 +1600,9 @@
}
p = SkipWhiteSpace( p, _encoding );
+ if (!p || !*p)
+ break;
+
if ( StringEqual( p, "version", true, _encoding ) )
{
TiXmlAttribute attrib;

8
tinyxml.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 15 15:02:44 CET 2023 - aschnell@suse.com
- avoid assertion on certain malformed input including null-byte
(bsc#1218040)
- added tinyxml-null-byte-assert.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 25 14:32:25 UTC 2021 - Christian Vögl <christian.voegl@suse.com> Mon Oct 25 14:32:25 UTC 2021 - Christian Vögl <christian.voegl@suse.com>
@@ -115,4 +122,3 @@ Fri Dec 14 00:00:00 CET 2007 - j.w.r.degoede@hhs.nl 2.5.3-2
Fri Nov 30 00:00:00 CET 2007 - j.w.r.degoede@hhs.nl 2.5.3-1 Fri Nov 30 00:00:00 CET 2007 - j.w.r.degoede@hhs.nl 2.5.3-1
- Initial Fedora Package - Initial Fedora Package

4
tinyxml.spec
View File

@@ -1,7 +1,7 @@
# #
# spec file for package tinyxml # spec file for package tinyxml
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@ Source5: Makefile.am.docs
Patch0: tinyxml-c_headers.patch Patch0: tinyxml-c_headers.patch
Patch1: tinyxml-entity.patch Patch1: tinyxml-entity.patch
Patch2: tinyxml-2.62-fix-infinite-loop.patch Patch2: tinyxml-2.62-fix-infinite-loop.patch
Patch3: tinyxml-null-byte-assert.patch
URL: http://sourceforge.net/projects/tinyxml URL: http://sourceforge.net/projects/tinyxml
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@@ -87,6 +88,7 @@ libtinyxml
%patch0 %patch0
%patch1 %patch1
%patch2 -p1 %patch2 -p1
%patch3 -p1
mkdir -p m4 mkdir -p m4
cp %{S:1} %{S:2} %{S:3} %{S:4} . cp %{S:1} %{S:2} %{S:3} %{S:4} .
cp %{S:5} docs/Makefile.am cp %{S:5} docs/Makefile.am