diff --git a/expat-CVE-2009-3560.patch b/expat-CVE-2009-3560.patch index af827f7..13a0cdd 100644 --- a/expat-CVE-2009-3560.patch +++ b/expat-CVE-2009-3560.patch @@ -1,16 +1,14 @@ -http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.164&r2=1.166&view=patch +http://expat.cvs.sourceforge.net/viewvc/expat/expat/lib/xmlparse.c?r1=1.164&r2=1.165 Index: lib/xmlparse.c =================================================================== --- lib/xmlparse.c.orig +++ lib/xmlparse.c -@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser, - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ +@@ -3725,7 +3725,6 @@ doProlog(XML_Parser parser, + return XML_ERROR_NO_ELEMENTS; + default: + tok = -tok; +- next = end; + break; + } + } diff --git a/expat.changes b/expat.changes index 8e497a8..77c1760 100644 --- a/expat.changes +++ b/expat.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Fri Jan 8 15:04:28 CET 2010 - prusnak@suse.cz - -- fix CVE-2009-3560.patch [bnc#566434] - -------------------------------------------------------------------- -Sun Dec 13 19:28:22 CET 2009 - jengelh@medozas.de - -- add baselibs.conf as a source - ------------------------------------------------------------------- Fri Dec 4 15:43:29 CET 2009 - prusnak@suse.cz diff --git a/expat.spec b/expat.spec index bf5e90a..81df7d2 100644 --- a/expat.spec +++ b/expat.spec @@ -32,7 +32,6 @@ Obsoletes: expat-64bit Summary: XML Parser Toolkit Source0: %{name}-%{version}.tar.bz2 Source1: %{name}faq.html -Source2: baselibs.conf Patch0: %{name}-CVE-2009-2625.patch Patch1: %{name}-CVE-2009-3560.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build