svn commit: r200494 - stable/8/contrib/expat/lib
Xin LI
delphij at FreeBSD.org
Sun Dec 13 17:05:41 PST 2009
Author: delphij
Date: Mon Dec 14 01:05:40 2009
New Revision: 200494
URL: http://svn.freebsd.org/changeset/base/200494
Log:
MFC r200392:
Apply two vendor fixes for CVE-2009-3720.
Security: CVE-2009-3720
Modified:
stable/8/contrib/expat/lib/xmlparse.c
stable/8/contrib/expat/lib/xmltok_impl.c
Directory Properties:
stable/8/contrib/expat/ (props changed)
Modified: stable/8/contrib/expat/lib/xmlparse.c
==============================================================================
--- stable/8/contrib/expat/lib/xmlparse.c Mon Dec 14 01:04:59 2009 (r200493)
+++ stable/8/contrib/expat/lib/xmlparse.c Mon Dec 14 01:05:40 2009 (r200494)
@@ -3725,7 +3725,6 @@ doProlog(XML_Parser parser,
return XML_ERROR_NO_ELEMENTS;
default:
tok = -tok;
- next = end;
break;
}
}
Modified: stable/8/contrib/expat/lib/xmltok_impl.c
==============================================================================
--- stable/8/contrib/expat/lib/xmltok_impl.c Mon Dec 14 01:04:59 2009 (r200493)
+++ stable/8/contrib/expat/lib/xmltok_impl.c Mon Dec 14 01:05:40 2009 (r200494)
@@ -1744,7 +1744,7 @@ PREFIX(updatePosition)(const ENCODING *e
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr < end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
More information about the svn-src-stable-8
mailing list