From owner-svn-src-all@FreeBSD.ORG  Mon Feb 24 14:40:29 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 84011E50;
 Mon, 24 Feb 2014 14:40:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6B2791DB5;
 Mon, 24 Feb 2014 14:40:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1OEeTKs058877;
 Mon, 24 Feb 2014 14:40:29 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1OEeTtL058876;
 Mon, 24 Feb 2014 14:40:29 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201402241440.s1OEeTtL058876@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 24 Feb 2014 14:40:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262447 - head/lib/libiconv_modules/VIQR
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Feb 2014 14:40:29 -0000

Author: tijl
Date: Mon Feb 24 14:40:28 2014
New Revision: 262447
URL: http://svnweb.freebsd.org/changeset/base/262447

Log:
  Fix an array index out of bounds bug in iconv VIQR (Vietnamese) module.
  
  PR:		185964
  Submitted by:	Manuel Mausz <manuel-freebsd@mausz.at>
  MFC after:	5 days

Modified:
  head/lib/libiconv_modules/VIQR/citrus_viqr.c

Modified: head/lib/libiconv_modules/VIQR/citrus_viqr.c
==============================================================================
--- head/lib/libiconv_modules/VIQR/citrus_viqr.c	Mon Feb 24 13:59:23 2014	(r262446)
+++ head/lib/libiconv_modules/VIQR/citrus_viqr.c	Mon Feb 24 14:40:28 2014	(r262447)
@@ -457,7 +457,7 @@ _citrus_VIQR_encoding_module_init(_VIQRE
 			return (errnum);
 		}
 	}
-	for (i = 0;; ++i) {
+	for (i = 0; i < mnemonic_ext_size; ++i) {
 		p = &mnemonic_ext[i];
 		n = strlen(p->name);
 		if (ei->mb_cur_max < n)