ICU 56 update step 1

source/common/unistr_case.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 1999-2011, International Business Machines
+*   Copyright (C) 1999-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  unistr_case.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:2
 *
 *   created on: 2004aug19
 *   created by: Markus W. Scherer
@@ skipping 78 matching lines @@
   }
 
   // We need to allocate a new buffer for the internal string case mapping function.
   // This is very similar to how doReplace() keeps the old array pointer
   // and deletes the old array itself after it is done.
   // In addition, we are forcing cloneArrayIfNeeded() to always allocate a new array.
   UChar oldStackBuffer[US_STACKBUF_SIZE];
   UChar *oldArray;
   int32_t oldLength;
 
-  if(fFlags&kUsingStackBuffer) {
+  if(fUnion.fFields.fLengthAndFlags&kUsingStackBuffer) {
     // copy the stack buffer contents because it will be overwritten
-    u_memcpy(oldStackBuffer, fUnion.fStackBuffer, fShortLength);
     oldArray = oldStackBuffer;
-    oldLength = fShortLength;
+    oldLength = getShortLength();
+    u_memcpy(oldStackBuffer, fUnion.fStackFields.fBuffer, oldLength);
   } else {
     oldArray = getArrayStart();
     oldLength = length();
   }
 
   int32_t capacity;
   if(oldLength <= US_STACKBUF_SIZE) {
     capacity = US_STACKBUF_SIZE;
   } else {
     capacity = oldLength + 20;
@@ skipping 53 matching lines @@
     const UnicodeString *str1 = (const UnicodeString*) key1.pointer;
     const UnicodeString *str2 = (const UnicodeString*) key2.pointer;
     if (str1 == str2) {
         return TRUE;
     }
     if (str1 == NULL || str2 == NULL) {
         return FALSE;
     }
     return str1->caseCompare(*str2, U_FOLD_CASE_DEFAULT) == 0;
 }