Apply ICU patches for ICU tickets 6175 (ISO-2022 and ...

third_party/icu38/source/common/ucnv.c

 /*
 ******************************************************************************
 *
 *   Copyright (C) 1998-2007, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
 *
 *  ucnv.c:
 *  Implements APIs for the ICU's codeset conversion library;
@@ skipping 1510 matching lines @@
             /* copy toUBytes[] to invalidCharBuffer[] */
             errorInputLength=cnv->invalidCharLength=cnv->toULength;
             if(errorInputLength>0) {
                 uprv_memcpy(cnv->invalidCharBuffer, cnv->toUBytes, errorInputLength);
             }
 
             /* set the converter state to deal with the next character */
             cnv->toULength=0;
 
             /* call the callback function */
+            if(cnv->toUCallbackReason==UCNV_ILLEGAL && *err==U_INVALID_CHAR_FOUND) {
+                cnv->toUCallbackReason = UCNV_UNASSIGNED;
+            }
             cnv->fromCharErrorBehaviour(cnv->toUContext, pArgs,
                 cnv->invalidCharBuffer, errorInputLength,
-                (*err==U_INVALID_CHAR_FOUND || *err==U_UNSUPPORTED_ESCAPE_SEQUENCE) ?
-                    UCNV_UNASSIGNED : UCNV_ILLEGAL,
+                cnv->toUCallbackReason,
                 err);
+            cnv->toUCallbackReason = UCNV_ILLEGAL; /* reset to default value */
 
             /*
              * loop back to the offset handling
              *
              * this flag will indicate after offset handling
              * that a callback was called;
              * if the callback did not resolve the error, then we return
              */
             calledCallback=TRUE;
         }
@@ skipping 1333 matching lines @@
 #endif
 
 /*
  * Hey, Emacs, please set the following:
  *
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  *
  */