From f0bfac70f5ab52fb05fd7d403fa2b7261e801fa5 Mon Sep 17 00:00:00 2001 From: Markus Scherer Date: Wed, 27 Sep 2017 22:51:01 +0000 Subject: [PATCH] ICU-13362 avoid memcmp(nullptr, nullptr, 0) X-SVN-Rev: 40488 --- icu4c/source/i18n/collationdatareader.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/icu4c/source/i18n/collationdatareader.cpp b/icu4c/source/i18n/collationdatareader.cpp index 636eb14b7c7..0eb1861343c 100644 --- a/icu4c/source/i18n/collationdatareader.cpp +++ b/icu4c/source/i18n/collationdatareader.cpp @@ -419,7 +419,8 @@ CollationDataReader::read(const CollationTailoring *base, const uint8_t *inBytes tailoring.data, ts, fastLatinPrimaries, UPRV_LENGTHOF(fastLatinPrimaries)); if(options == ts.options && ts.variableTop != 0 && reorderCodesLength == ts.reorderCodesLength && - uprv_memcmp(reorderCodes, ts.reorderCodes, reorderCodesLength * 4) == 0 && + (reorderCodesLength == 0 || + uprv_memcmp(reorderCodes, ts.reorderCodes, reorderCodesLength * 4) == 0) && fastLatinOptions == ts.fastLatinOptions && (fastLatinOptions < 0 || uprv_memcmp(fastLatinPrimaries, ts.fastLatinPrimaries,