ICU 56 update step 1

source/i18n/rbt_pars.cpp

 /*
  **********************************************************************
- *   Copyright (C) 1999-2011, International Business Machines
+ *   Copyright (C) 1999-2015, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  *   Date        Name        Description
  *   11/17/99    aliu        Creation.
  **********************************************************************
  */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_TRANSLITERATION
@@ skipping 1081 matching lines @@
                 // NULL pointer check
                 if (data->variables == NULL) {
                     status = U_MEMORY_ALLOCATION_ERROR;
                     return;
                 }
                 data->variablesAreOwned = (i == 0);
             }
 
             for (int32_t j = 0; j < data->variablesLength; j++) {
                 data->variables[j] =
-                    ((UnicodeFunctor*)variablesVector.elementAt(j));
+                    ((UnicodeSet*)variablesVector.elementAt(j));
             }
             
             data->variableNames.removeAll();
-            int32_t pos = -1;
+            int32_t pos = UHASH_FIRST;
             const UHashElement* he = variableNames.nextElement(pos);
             while (he != NULL) {
                 UnicodeString* tempus = (UnicodeString*)(((UnicodeString*)(he->value.pointer))->clone());
                 if (tempus == NULL) {
                     status = U_MEMORY_ALLOCATION_ERROR;
                     return;
                 }
                 data->variableNames.put(*((UnicodeString*)(he->key.pointer)),
                     tempus, status);
                 he = variableNames.nextElement(pos);
@@ skipping 547 matching lines @@
         if(c == QUOTE) {
             quoted = (UBool)!quoted;
         }
         else if (!quoted) {
             if (c == RULE_COMMENT_CHAR) {
                 /* skip comments and all preceding spaces */
                 while (targetStart < target && *(target - 1) == 0x0020) {
                     target--;
                 }
                 do {
+                    if (source == sourceLimit) {
+                        c = U_SENTINEL;
+                        break;
+                    }
                     c = *(source++);
                 }
                 while (c != CR && c != LF);
+                if (c < 0) {
+                    break;
+                }
             }
-            else if (c == ESCAPE) {
+            else if (c == ESCAPE && source < sourceLimit) {
                 UChar32   c2 = *source;
                 if (c2 == CR || c2 == LF) {
                     /* A backslash at the end of a line. */
                     /* Since we're stripping lines, ignore the backslash. */
                     source++;
                     continue;
                 }
                 if (c2 == 0x0075 && source+5 < sourceLimit) { /* \u seen. \U isn't unescaped. */
                     int32_t escapeOffset = 0;
                     UnicodeString escapedStr(source, 5);
@@ skipping 37 matching lines @@
         U16_APPEND_UNSAFE(target, index, c);
         target+=index;
     }
     if (target < targetLimit) {
         *target = 0;
     }
     return (int32_t)(target-targetStart);
 }
 
 #endif /* #if !UCONFIG_NO_TRANSLITERATION */