From d7fc6fc731010ef6356a431207d24924f5bf48c1 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 14 Dec 2009 01:06:55 +0000
Subject: MFC r200392:

Apply two vendor fixes for CVE-2009-3720.

Security:	CVE-2009-3720
---
 contrib/expat/lib/xmlparse.c    | 1 -
 contrib/expat/lib/xmltok_impl.c | 2 +-
 2 files changed, 1 insertion(+), 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: \
-- 
cgit v1.3