diff options
| author | delphij <delphij@FreeBSD.org> | 2009-12-11 02:09:46 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-12-11 02:09:46 +0000 |
| commit | 260d752e2ed20ec9a7dda8776df7ac30f3da43fa (patch) | |
| tree | d0e3ba96a26c4440f4e0291b4891a9b2246b11cf | |
| parent | 063a5906ed8d2fa65418d13b7fead939b951b92f (diff) | |
| download | FreeBSD-src-260d752e2ed20ec9a7dda8776df7ac30f3da43fa.zip FreeBSD-src-260d752e2ed20ec9a7dda8776df7ac30f3da43fa.tar.gz | |
Apply two vendor fixes for CVE-2009-3720.
Security: CVE-2009-3720
MFC after: 3 days
| -rw-r--r-- | contrib/expat/lib/xmlparse.c | 1 | ||||
| -rw-r--r-- | contrib/expat/lib/xmltok_impl.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/contrib/expat/lib/xmlparse.c b/contrib/expat/lib/xmlparse.c index 94e31de..e111460 100644 --- a/contrib/expat/lib/xmlparse.c +++ b/contrib/expat/lib/xmlparse.c @@ -3725,7 +3725,6 @@ doProlog(XML_Parser parser, return XML_ERROR_NO_ELEMENTS; default: tok = -tok; - next = end; break; } } diff --git a/contrib/expat/lib/xmltok_impl.c b/contrib/expat/lib/xmltok_impl.c index 1268819..16dfb85 100644 --- a/contrib/expat/lib/xmltok_impl.c +++ b/contrib/expat/lib/xmltok_impl.c @@ -1744,7 +1744,7 @@ PREFIX(updatePosition)(const ENCODING *enc, const char *end, POSITION *pos) { - while (ptr != end) { + while (ptr < end) { switch (BYTE_TYPE(enc, ptr)) { #define LEAD_CASE(n) \ case BT_LEAD ## n: \ |
