From owner-svn-src-stable@FreeBSD.ORG Mon Dec 14 01:06:22 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2626E106568D; Mon, 14 Dec 2009 01:06:22 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 142678FC3A; Mon, 14 Dec 2009 01:06:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBE16LeM003140; Mon, 14 Dec 2009 01:06:21 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBE16LoZ003137; Mon, 14 Dec 2009 01:06:21 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200912140106.nBE16LoZ003137@svn.freebsd.org> From: Xin LI Date: Mon, 14 Dec 2009 01:06:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200495 - stable/6/contrib/expat/lib X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2009 01:06:22 -0000 Author: delphij Date: Mon Dec 14 01:06:21 2009 New Revision: 200495 URL: http://svn.freebsd.org/changeset/base/200495 Log: MFC r200392: Apply two vendor fixes for CVE-2009-3720. Security: CVE-2009-3720 Modified: stable/6/contrib/expat/lib/xmlparse.c stable/6/contrib/expat/lib/xmltok_impl.c Directory Properties: stable/6/contrib/expat/ (props changed) Modified: stable/6/contrib/expat/lib/xmlparse.c ============================================================================== --- stable/6/contrib/expat/lib/xmlparse.c Mon Dec 14 01:05:40 2009 (r200494) +++ stable/6/contrib/expat/lib/xmlparse.c Mon Dec 14 01:06:21 2009 (r200495) @@ -3168,7 +3168,6 @@ doProlog(XML_Parser parser, return XML_ERROR_NO_ELEMENTS; default: tok = -tok; - next = end; break; } } Modified: stable/6/contrib/expat/lib/xmltok_impl.c ============================================================================== --- stable/6/contrib/expat/lib/xmltok_impl.c Mon Dec 14 01:05:40 2009 (r200494) +++ stable/6/contrib/expat/lib/xmltok_impl.c Mon Dec 14 01:06:21 2009 (r200495) @@ -1741,7 +1741,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: \