ICU 56 update step 1

source/common/utext.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2005-2014, International Business Machines
+*   Copyright (C) 2005-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  utext.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2005apr12
 *   created by: Markus W. Scherer
@@ skipping 2006 matching lines @@
 utext_openReplaceable(UText *ut, Replaceable *rep, UErrorCode *status)
 {
     if(U_FAILURE(*status)) {
         return NULL;
     }
     if(rep==NULL) {
         *status=U_ILLEGAL_ARGUMENT_ERROR;
         return NULL;
     }
     ut = utext_setup(ut, sizeof(ReplExtra), status);
+    if(U_FAILURE(*status)) {
+        return ut;
+    }
 
     ut->providerProperties = I32_FLAG(UTEXT_PROVIDER_WRITABLE);
     if(rep->hasMetaData()) {
         ut->providerProperties |=I32_FLAG(UTEXT_PROVIDER_HAS_META_DATA);
     }
 
     ut->pFuncs  = &repFuncs;
     ut->context =  rep;
     return ut;
 }
@@ skipping 685 matching lines @@
     }
 
     if (deep) {
         // There is no CharacterIterator API for cloning the underlying text storage.
         *status = U_UNSUPPORTED_ERROR;
         return NULL;
     } else {
         CharacterIterator *srcCI =(CharacterIterator *)src->context;
         srcCI = srcCI->clone();
         dest = utext_openCharacterIterator(dest, srcCI, status);
+        if (U_FAILURE(*status)) {
+            return dest;
+        }
         // cast off const on getNativeIndex.
         //   For CharacterIterator based UTexts, this is safe, the operation is const.
         int64_t  ix = utext_getNativeIndex((UText *)src);
         utext_setNativeIndex(dest, ix);
         dest->r = srcCI;    // flags that this UText owns the CharacterIterator
     }
     return dest;
 }
 
 static int32_t U_CALLCONV
@@ skipping 93 matching lines @@
         //          zero without Access() thinking that the chunk is valid.
         ut->chunkContents        = (UChar *)ut->p;
         ut->chunkNativeStart     = -1;
         ut->chunkOffset          = 1;
         ut->chunkNativeLimit     = 0;
         ut->chunkLength          = 0;
         ut->nativeIndexingLimit  = ut->chunkOffset;  // enables native indexing
     }
     return ut;
 }