diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
| commit | f67d5a9a39c658ba38ce4efd3968fb76ed97ac70 (patch) | |
| tree | fb0a753dab894f13519ea969ad7edcfc19e3b56f /pkgs/development/libraries/expat/cve-2009-3560.patch | |
| parent | 473ba2212d3b8cc16b5ffb2f5a6367425614357c (diff) | |
| parent | 9ada368ef842d5bc52d0db0b92ee0217cc213a83 (diff) | |
| download | nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.gz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.bz2 nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.lz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.xz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.zst nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.zip | |
Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
Diffstat (limited to 'pkgs/development/libraries/expat/cve-2009-3560.patch')
| -rw-r--r-- | pkgs/development/libraries/expat/cve-2009-3560.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/libraries/expat/cve-2009-3560.patch b/pkgs/development/libraries/expat/cve-2009-3560.patch deleted file mode 100644 index 71da9e393519..000000000000 --- a/pkgs/development/libraries/expat/cve-2009-3560.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 */ |