From 84931997bb4c064d0474363ea9e7dfa859ca2a39 Mon Sep 17 00:00:00 2001
From: ahodgkinson <ahodgkinson@0109f412-320b-0410-ab79-c3e0c5ffbbe6>
Date: Mon, 21 Aug 2006 20:30:14 +0000
Subject: [PATCH] FTK changes.  Fixed bug in f_combineWPChar that was resulting
 in an illegal memory access when processing characters beyond 0x0F00.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@780 0109f412-320b-0410-ab79-c3e0c5ffbbe6
---
 ftk/src/ftkcoll.cpp  |  3 ++-
 ftk/util/ftktest.cpp | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ftk/src/ftkcoll.cpp b/ftk/src/ftkcoll.cpp
index b95cbe4..204e57d 100644
--- a/ftk/src/ftkcoll.cpp
+++ b/ftk/src/ftkcoll.cpp
@@ -5694,7 +5694,8 @@ FLMBOOL FLMAPI f_combineWPChar(
 	BASE_DIACRIT_TABLE *		pTable;
 
 	ucCharSet = HI( ui16BaseChar);
-	if( ucCharSet > F_NCHSETS)
+	
+	if( ucCharSet >= F_NCHSETS)
 	{
 		return( TRUE);
 	}
diff --git a/ftk/util/ftktest.cpp b/ftk/util/ftktest.cpp
index e209ebc..33dddb1 100644
--- a/ftk/util/ftktest.cpp
+++ b/ftk/util/ftktest.cpp
@@ -2306,21 +2306,21 @@ Desc:
 ****************************************************************************/
 FSTATIC BASE_DIACRIT * flm_car60_c[ F_NCHSETS] = 
 {
-	(BASE_DIACRIT*)0,						// no composed characters for ascii
+	(BASE_DIACRIT *)0,					// no composed characters for ascii
 	&flm_ml1c,
-	(BASE_DIACRIT*)0,						// no composed characters for multinational 2
-	(BASE_DIACRIT*)0,						// no composed characters for line draw
-	(BASE_DIACRIT*)0,						// no composed characters for typographic
-	(BASE_DIACRIT*)0,						// no composed characters for icons
-	(BASE_DIACRIT*)0,						// no composed characters for math
-	(BASE_DIACRIT*)0,						// no composed characters for math extension
+	(BASE_DIACRIT *)0,					// no composed characters for multinational 2
+	(BASE_DIACRIT *)0,					// no composed characters for line draw
+	(BASE_DIACRIT *)0,					// no composed characters for typographic
+	(BASE_DIACRIT *)0,					// no composed characters for icons
+	(BASE_DIACRIT *)0,					// no composed characters for math
+	(BASE_DIACRIT *)0,					// no composed characters for math extension
 	&flm_grk_c,								// Greek
-	(BASE_DIACRIT*)0,						// Hebrew
+	(BASE_DIACRIT *)0,					// Hebrew
 	&flm_rus_c,								// Cyrillic - Russian
-	(BASE_DIACRIT*)0,						// Hiragana or Katakana (Japanese)
-	(BASE_DIACRIT*)0,						// no composed characters for user
-	(BASE_DIACRIT*)0,						// no composed characters for Arabic
-	(BASE_DIACRIT*)0,						// no composed characters for Arabic Script
+	(BASE_DIACRIT *)0,					// Hiragana or Katakana (Japanese)
+	(BASE_DIACRIT *)0,					// no composed characters for user
+	(BASE_DIACRIT *)0,					// no composed characters for Arabic
+	(BASE_DIACRIT *)0						// no composed characters for Arabic Script
 };
 
 /****************************************************************************
@@ -5268,9 +5268,9 @@ FLMBOOL flmCh6Cmbcar(
 	BASE_DIACRIT_TABLE *	pTable;
 
 	ucCharSet = HI( ui16BaseChar);
-	if( ucCharSet > F_NCHSETS)
+	if( ucCharSet >= F_NCHSETS)
 	{
-		return (TRUE);
+		return( TRUE);
 	}
 
 	// Is base ASCII? If so, look in multinational 1
@@ -5280,7 +5280,7 @@ FLMBOOL flmCh6Cmbcar(
 		ucCharSet = F_CHSMUL1;
 	}
 
-	if( (pBaseDiacritic = flm_car60_c[ucCharSet]) == 0)
+	if( (pBaseDiacritic = flm_car60_c[ ucCharSet]) == 0)
 	{
 		return (TRUE);
 	}