ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / layout / IndicReordering.cpp

diff --git a/icuSources/layout/IndicReordering.cpp b/icuSources/layout/IndicReordering.cpp
index 8f247681c74bae7a38b5894d974bc79b89f621e6..1ebc94a60cd61cf0885eeb683672f2e61eb90e99 100644 (file)
--- a/icuSources/layout/IndicReordering.cpp
+++ b/icuSources/layout/IndicReordering.cpp
@@ -1,6 +1,6 @@
 /*
 / *
 /*
 / *

- * (C) Copyright IBM Corp. 1998-2009 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2015 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -241,7 +241,7 @@ public:
                                        le_uint32 saveAuxData = fGlyphStorage.getAuxData(i+inv_count,success);
                     const SplitMatra *splitMatra = classTable->getSplitMatra(matraClass);
                     int j;
                                        le_uint32 saveAuxData = fGlyphStorage.getAuxData(i+inv_count,success);
                     const SplitMatra *splitMatra = classTable->getSplitMatra(matraClass);
                     int j;

-                    for (j = 0 ; *(splitMatra)[j] != 0 ; j++) {
+                    for (j = 0 ; j < SM_MAX_PIECES && *(splitMatra)[j] != 0 ; j++) {

                         LEUnicode piece = (*splitMatra)[j];
                                                if ( j == 0 ) {
                                                        fOutChars[i+inv_count] = piece;
                         LEUnicode piece = (*splitMatra)[j];
                                                if ( j == 0 ) {
                                                        fOutChars[i+inv_count] = piece;


@@ -332,7 +332,7 @@ public:
                 const SplitMatra *splitMatra = classTable->getSplitMatra(matraClass);
                 int i;
 
                 const SplitMatra *splitMatra = classTable->getSplitMatra(matraClass);
                 int i;
 

-                for (i = 0; i < 3 && (*splitMatra)[i] != 0; i += 1) {
+                for (i = 0; i < SM_MAX_PIECES && (*splitMatra)[i] != 0; i += 1) {

                     LEUnicode piece = (*splitMatra)[i];
                     IndicClassTable::CharClass pieceClass = classTable->getCharClass(piece);
 
                     LEUnicode piece = (*splitMatra)[i];
                     IndicClassTable::CharClass pieceClass = classTable->getCharClass(piece);
 


@@ -633,6 +633,11 @@ le_int32 IndicReordering::reorder(const LEUnicode *chars, le_int32 charCount, le
     MPreFixups *mpreFixups = NULL;
     const IndicClassTable *classTable = IndicClassTable::getScriptClassTable(scriptCode);
 
     MPreFixups *mpreFixups = NULL;
     const IndicClassTable *classTable = IndicClassTable::getScriptClassTable(scriptCode);
 

+    if (classTable==NULL) {
+        success = LE_INTERNAL_ERROR;
+        return 0;
+    }
+

     if (classTable->scriptFlags & SF_MPRE_FIXUP) {
         mpreFixups = new MPreFixups(charCount);
         if (mpreFixups == NULL) { 
     if (classTable->scriptFlags & SF_MPRE_FIXUP) {
         mpreFixups = new MPreFixups(charCount);
         if (mpreFixups == NULL) { 


@@ -1069,6 +1074,9 @@ le_int32 IndicReordering::v2process(const LEUnicode *chars, le_int32 charCount,
                                   LEUnicode *outChars, LEGlyphStorage &glyphStorage)
 {
     const IndicClassTable *classTable = IndicClassTable::getScriptClassTable(scriptCode);
                                   LEUnicode *outChars, LEGlyphStorage &glyphStorage)
 {
     const IndicClassTable *classTable = IndicClassTable::getScriptClassTable(scriptCode);

+    if (classTable == NULL) {
+        return 0;
+    }

 
     DynamicProperties dynProps[INDIC_BLOCK_SIZE];
     IndicReordering::getDynamicProperties(dynProps,classTable);
 
     DynamicProperties dynProps[INDIC_BLOCK_SIZE];
     IndicReordering::getDynamicProperties(dynProps,classTable);


@@ -1199,7 +1207,6 @@ void IndicReordering::getDynamicProperties( DynamicProperties *, const IndicClas
 
 
     LEUnicode currentChar;
 
 
     LEUnicode currentChar;

-    LEUnicode virama;

     LEUnicode workChars[2];
     LEGlyphStorage workGlyphs;
 
     LEUnicode workChars[2];
     LEGlyphStorage workGlyphs;
 


@@ -1207,14 +1214,17 @@ void IndicReordering::getDynamicProperties( DynamicProperties *, const IndicClas
 
     //le_int32 offset = 0;
 
 
     //le_int32 offset = 0;
 

+#if 0
+// TODO:  Should this section of code have actually been doing something?

     // First find the relevant virama for the script we are dealing with
     // First find the relevant virama for the script we are dealing with

-
+    LEUnicode virama;

     for ( currentChar = classTable->firstChar ; currentChar <= classTable->lastChar ; currentChar++ ) {
         if ( classTable->isVirama(currentChar)) {
             virama = currentChar;
             break;
         }
     }
     for ( currentChar = classTable->firstChar ; currentChar <= classTable->lastChar ; currentChar++ ) {
         if ( classTable->isVirama(currentChar)) {
             virama = currentChar;
             break;
         }
     }

+#endif

 
     for ( currentChar = classTable->firstChar ; currentChar <= classTable->lastChar ; currentChar++ ) {
         if ( classTable->isConsonant(currentChar)) {
 
     for ( currentChar = classTable->firstChar ; currentChar <= classTable->lastChar ; currentChar++ ) {
         if ( classTable->isConsonant(currentChar)) {