summary refs log tree commit diff
path: root/pkgs/development/libraries/expat/cve-2009-3560.patch
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-02-11 13:55:30 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-02-11 13:55:30 +0000
commit5dcde6d4370680c7e2bae609e3ebedbb3f9b1d09 (patch)
tree0840a042999bde0fdef99587b714f3f985865108 /pkgs/development/libraries/expat/cve-2009-3560.patch
parentfc933aaa50dbe74ab91e51571feeb568bd8f9e21 (diff)
downloadnixlib-5dcde6d4370680c7e2bae609e3ebedbb3f9b1d09.tar
nixlib-5dcde6d4370680c7e2bae609e3ebedbb3f9b1d09.tar.gz
nixlib-5dcde6d4370680c7e2bae609e3ebedbb3f9b1d09.tar.bz2
nixlib-5dcde6d4370680c7e2bae609e3ebedbb3f9b1d09.tar.lz
nixlib-5dcde6d4370680c7e2bae609e3ebedbb3f9b1d09.tar.xz
nixlib-5dcde6d4370680c7e2bae609e3ebedbb3f9b1d09.tar.zst
nixlib-5dcde6d4370680c7e2bae609e3ebedbb3f9b1d09.zip
* Expat: apply a fix for CVE-2009-3560.
svn path=/nixpkgs/branches/x-updates/; revision=25902
Diffstat (limited to 'pkgs/development/libraries/expat/cve-2009-3560.patch')
-rw-r--r--pkgs/development/libraries/expat/cve-2009-3560.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/libraries/expat/cve-2009-3560.patch b/pkgs/development/libraries/expat/cve-2009-3560.patch
new file mode 100644
index 000000000000..71da9e393519
--- /dev/null
+++ b/pkgs/development/libraries/expat/cve-2009-3560.patch
@@ -0,0 +1,18 @@
+From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/expat/files/expat-2.0.1-CVE-2009-3560-revised.patch?revision=1.1
+
+http://nvd.nist.gov/nvd.cfm?cvename=CVE-2009-3560
+http://bugs.gentoo.org/show_bug.cgi?id=303727
+http://cvs.fedoraproject.org/viewvc/rpms/expat/devel/
+
+--- a/lib/xmlparse.c
++++ b/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 */