Imported Upstream version 58.1

[platform/upstream/icu.git] / source / tools / toolutil / ucm.c

diff --git a/source/tools/toolutil/ucm.c b/source/tools/toolutil/ucm.c
index adb3ebd..8d4cdfc 100644 (file)
--- a/source/tools/toolutil/ucm.c
+++ b/source/tools/toolutil/ucm.c
@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
 *
@@ -967,7 +969,7 @@ ucm_addMapping(UCMTable *table,
             exit(U_MEMORY_ALLOCATION_ERROR);
         }
 
-        uprv_memcpy(table->codePoints+idx, codePoints, m->uLen*4);
+        uprv_memcpy(table->codePoints+idx, codePoints, (size_t)m->uLen*4);
         m->u=idx;
     }
 
@@ -1124,7 +1126,7 @@ ucm_addMappingAuto(UCMFile *ucm, UBool forBase, UCMStates *baseStates,
 
 U_CAPI UBool U_EXPORT2
 ucm_addMappingFromLine(UCMFile *ucm, const char *line, UBool forBase, UCMStates *baseStates) {
-    UCMapping m={ 0 };
+  UCMapping m={ 0, {0}, 0, 0, 0, 0 };
     UChar32 codePoints[UCNV_EXT_MAX_UCHARS];
     uint8_t bytes[UCNV_EXT_MAX_BYTES];