diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2009-02-07 00:14:10 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2009-02-07 00:14:10 +0000 |
| commit | 9ffc0270c40e07a7820ee4a6eb104ba3d5978c41 (patch) | |
| tree | 0114492b33088226e5680db7fd6bc86b21344e60 /textproc/libxml2 | |
| parent | f64736672ea4890f9e485396a979ec5db4c3d477 (diff) | |
| download | ports-9ffc0270c40e07a7820ee4a6eb104ba3d5978c41.tar.gz ports-9ffc0270c40e07a7820ee4a6eb104ba3d5978c41.zip | |
Notes
Diffstat (limited to 'textproc/libxml2')
| -rw-r--r-- | textproc/libxml2/Makefile | 4 | ||||
| -rw-r--r-- | textproc/libxml2/distinfo | 6 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-CVE-2008-4225 | 26 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-CVE-2008-4226 | 38 |
4 files changed, 5 insertions, 69 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 55d2ead37bd0..fa052020c76a 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -12,8 +12,8 @@ # PORTNAME= libxml2 -PORTVERSION= 2.7.2 -PORTREVISION?= 1 +PORTVERSION= 2.7.3 +PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= ftp://fr.rpmfind.net/pub/libxml/ \ ftp://gd.tuwien.ac.at/pub/libxml/ \ diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index dee3d93170bb..01366f259ffe 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libxml2-2.7.2.tar.gz) = dc43ff7ae6aded45f578c87b7b0c8766 -SHA256 (gnome2/libxml2-2.7.2.tar.gz) = c01bd621f771cdee349877f55cc841a1bdfb206b2cf5c9aa62aa6a9680e61980 -SIZE (gnome2/libxml2-2.7.2.tar.gz) = 4790639 +MD5 (gnome2/libxml2-2.7.3.tar.gz) = 8f4fda3969237c2a33bdb1583b5d06b2 +SHA256 (gnome2/libxml2-2.7.3.tar.gz) = 432464d8c9bd8060d9c1fdef1cfa75803c1a363ceac20b21f8c7e34e056e5a98 +SIZE (gnome2/libxml2-2.7.3.tar.gz) = 4789450 diff --git a/textproc/libxml2/files/patch-CVE-2008-4225 b/textproc/libxml2/files/patch-CVE-2008-4225 deleted file mode 100644 index 0666795c6abc..000000000000 --- a/textproc/libxml2/files/patch-CVE-2008-4225 +++ /dev/null @@ -1,26 +0,0 @@ ---- tree.c.orig 2008-10-31 18:14:00.000000000 -0700 -+++ tree.c 2008-10-31 18:14:35.000000000 -0700 -@@ -14,7 +14,7 @@ - #include "libxml.h" - - #include <string.h> /* for memset() only ! */ -- -+#include <limits.h> - #ifdef HAVE_CTYPE_H - #include <ctype.h> - #endif -@@ -6996,7 +6996,13 @@ - case XML_BUFFER_ALLOC_DOUBLEIT: - /*take care of empty case*/ - newSize = (buf->size ? buf->size*2 : size + 10); -- while (size > newSize) newSize *= 2; -+ while (size > newSize) { -+ if (newSize > UINT_MAX / 2) { -+ xmlTreeErrMemory("growing buffer"); -+ return 0; -+ } -+ newSize *= 2; -+ } - break; - case XML_BUFFER_ALLOC_EXACT: - newSize = size+10; diff --git a/textproc/libxml2/files/patch-CVE-2008-4226 b/textproc/libxml2/files/patch-CVE-2008-4226 deleted file mode 100644 index 79e808b40c34..000000000000 --- a/textproc/libxml2/files/patch-CVE-2008-4226 +++ /dev/null @@ -1,38 +0,0 @@ ---- SAX2.c.orig 2008-01-25 08:10:04.000000000 -0500 -+++ SAX2.c 2008-11-07 05:07:34.000000000 -0500 -@@ -11,6 +11,7 @@ - #include "libxml.h" - #include <stdlib.h> - #include <string.h> -+#include <limits.h> - #include <libxml/xmlmemory.h> - #include <libxml/tree.h> - #include <libxml/parser.h> -@@ -26,6 +27,11 @@ - #include <libxml/HTMLtree.h> - #include <libxml/globals.h> - -+/* Define SIZE_T_MAX unless defined through <limits.h>. */ -+#ifndef SIZE_T_MAX -+# define SIZE_T_MAX ((size_t)-1) -+#endif /* !SIZE_T_MAX */ -+ - /* #define DEBUG_SAX2 */ - /* #define DEBUG_SAX2_TREE */ - -@@ -2445,9 +2451,14 @@ - (xmlDictOwns(ctxt->dict, lastChild->content))) { - lastChild->content = xmlStrdup(lastChild->content); - } -+ if ((size_t)ctxt->nodelen > SIZE_T_MAX - (size_t)len || -+ (size_t)ctxt->nodemem + (size_t)len > SIZE_T_MAX / 2) { -+ xmlSAX2ErrMemory(ctxt, "xmlSAX2Characters overflow prevented"); -+ return; -+ } - if (ctxt->nodelen + len >= ctxt->nodemem) { - xmlChar *newbuf; -- int size; -+ size_t size; - - size = ctxt->nodemem + len; - size *= 2; |