diff options
| author | Xin LI <delphij@FreeBSD.org> | 2009-12-14 01:06:55 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2009-12-14 01:06:55 +0000 |
| commit | d7fc6fc731010ef6356a431207d24924f5bf48c1 (patch) | |
| tree | c6cf103c7200ea4e1139de5b18714b3c5d48d582 | |
| parent | f4990bd2c7fc11eb7e63e104be27863e704f6a8c (diff) | |
MFC r200392:
Apply two vendor fixes for CVE-2009-3720.
Security: CVE-2009-3720
Notes
svn path=/stable/5/; revision=200496
| -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 ab877fef6ce5..8e230481f39b 100644 --- a/contrib/expat/lib/xmlparse.c +++ b/contrib/expat/lib/xmlparse.c @@ -3168,7 +3168,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 be3d1d31ca44..8698e6c43997 100644 --- a/contrib/expat/lib/xmltok_impl.c +++ b/contrib/expat/lib/xmltok_impl.c @@ -1741,7 +1741,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: \ |