diff --git a/icu4c/source/i18n/ucol.cpp b/icu4c/source/i18n/ucol.cpp index e63969a4ee0..5de75de8604 100644 --- a/icu4c/source/i18n/ucol.cpp +++ b/icu4c/source/i18n/ucol.cpp @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 1996-2006, International Business Machines +* Copyright (C) 1996-2007, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * file name: ucol.cpp @@ -4827,7 +4827,18 @@ ucol_calcSortKey(const UCollator *coll, break; } else { prevBuffSize = minBufferSize; + + uint32_t frenchStartOffset, frenchEndOffset; + if (frenchStartPtr != NULL) { + frenchStartOffset = frenchStartPtr - secStart; + frenchEndOffset = frenchEndPtr - secStart; + } secStart = reallocateBuffer(&secondaries, secStart, second, &secSize, 2*secSize, status); + if (frenchStartPtr != NULL) { + frenchStartPtr = secStart + frenchStartOffset; + frenchEndPtr = secStart + frenchEndOffset; + } + terStart = reallocateBuffer(&tertiaries, terStart, tert, &terSize, 2*terSize, status); caseStart = reallocateBuffer(&cases, caseStart, caseB, &caseSize, 2*caseSize, status); quadStart = reallocateBuffer(&quads, quadStart, quad, &quadSize, 2*quadSize, status); diff --git a/icu4c/source/test/cintltst/cfrtst.c b/icu4c/source/test/cintltst/cfrtst.c index 24dddaefb3d..3c61fb580b7 100644 --- a/icu4c/source/test/cintltst/cfrtst.c +++ b/icu4c/source/test/cintltst/cfrtst.c @@ -1,6 +1,6 @@ /******************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2001, International Business Machines Corporation and + * Copyright (c) 1997-2007, International Business Machines Corporation and * others. All Rights Reserved. ********************************************************************/ /******************************************************************************** @@ -128,17 +128,15 @@ const static UChar testBugs[][MAX_TOKEN_LEN] = }; +static void TestGetSortKey(void); void addFrenchCollTest(TestNode** root) { - - addTest(root, &TestSecondary, "tscoll/cfrtst/TestSecondary"); addTest(root, &TestTertiary, "tscoll/cfrtst/TestTertiary"); addTest(root, &TestExtra, "tscoll/cfrtst/TestExtra"); - - + addTest(root, &TestGetSortKey, "tscoll/cfrtst/TestGetSortKey"); } @@ -219,4 +217,119 @@ static void TestExtra() ucol_close(myCollation); } +static void TestGetSortKey() { + /* This is meant to test a buffer reallocation crash while using + French secondary sorting with a large buffer. + The fact that Japanese characters are used is irrelevant. */ + static const UChar pucUTF16[] = { + 0x3049,0x30b9,0x3088,0xfffd,0xfffd,0x308f,0xfffd,0x3042, + 0xfffd,0xfffd,0x305e,0xfffd,0x30b6,0x30bb,0x305b,0x30b1, + 0x3050,0x30af,0x304e,0x30bd,0xfffd,0x30c6,0xfffd,0xfffd, + 0x30e1,0xfffd,0xfffd,0x30d9,0xfffd,0x3092,0x3075,0x304a, + 0x3074,0x3070,0x30f5,0x30c4,0x306e,0x30df,0x3053,0xfffd, + 0x30a6,0x30b6,0x30e0,0xfffd,0x30bc,0x30ef,0x3087,0x30cc, + 0x305f,0x30de,0xfffd,0x3090,0x3063,0x30dc,0x30b6,0x30b9, + 0x30d2,0x3072,0x3061,0xfffd,0xfffd,0xfffd,0x307b,0x3092, + 0x30a5,0x30a9,0x30b1,0x30e7,0xfffd,0xfffd,0xfffd,0xfffd, + 0xfffd,0x305e,0xfffd,0x30c7,0x30ae,0x305b,0x308b,0x30c0, + 0x30f5,0xfffd,0xfffd,0xfffd,0x307d,0x304e,0xfffd,0xfffd, + 0x30c0,0x30c8,0x306f,0x307a,0x30dd,0x30e4,0x3084,0xfffd, + 0x308c,0x30f1,0xfffd,0x30c6,0xfffd,0x307a,0xfffd,0x3052, + 0x3056,0x305d,0x30b7,0xfffd,0x305b,0x30b0,0x30b9,0xfffd, + 0x30b2,0x306d,0x3044,0xfffd,0x3073,0xfffd,0x30be,0x30cf, + 0x3080,0xfffd,0x30a8,0x30f5,0x30a5,0x30c7,0x307c,0xfffd, + 0x30d1,0x305f,0x30b2,0xfffd,0x3053,0x30ca,0xfffd,0x30dd, + 0x3058,0x30c0,0x305d,0x30e1,0xfffd,0x30bb,0x305f,0x30d1, + 0x30f2,0x3058,0x3086,0x30ce,0x30db,0x30cb,0x30e9,0xfffd, + 0x308c,0xfffd,0xfffd,0x30af,0x30c4,0x3076,0x304c,0x30f5, + 0x30e8,0x308c,0xfffd,0x30e2,0x3073,0x30a3,0x304e,0x30ea, + 0xfffd,0x304f,0xfffd,0x306c,0x3044,0xfffd,0xfffd,0x30c9, + 0xfffd,0x30f5,0xfffd,0xfffd,0xfffd,0x30eb,0x30a8,0xfffd, + 0x306d,0x307d,0x30d8,0x3069,0xfffd,0xfffd,0x3086,0x30a9, + 0xfffd,0x3076,0x30e9,0x30cc,0x3074,0x30e0,0xfffd,0xfffd, + 0xfffd,0x30f0,0x3086,0x30ac,0x3076,0x3068,0x30c7,0xfffd, + 0x30b7,0x30d2,0x3048,0x308e,0x30e8,0x30d9,0x30ce,0x30d0, + 0x308b,0x30ee,0x30e6,0x3079,0x30f3,0x30af,0xfffd,0x3079, + 0xfffd,0xfffd,0x30ca,0x30bf,0xfffd,0x30b5,0xfffd,0xfffd, + 0x3093,0xfffd,0x30ba,0xfffd,0x3076,0x3047,0x304a,0xfffd, + 0xfffd,0x3086,0xfffd,0x3081,0xfffd,0x30f6,0x3066,0xfffd, + 0xfffd,0x30b6,0x30ef,0x30e2,0x30bf,0xfffd,0x3053,0x304a, + 0xfffd,0xfffd,0x304a,0x30e8,0xfffd,0x30e2,0xfffd,0xfffd, + 0x305c,0x3081,0x30c6,0xfffd,0x3091,0x3046,0x306a,0x3059, + 0xfffd,0xfffd,0x30dd,0x30d1,0x308a,0x30ee,0xfffd,0xfffd, + 0x308a,0x3042,0x30da,0xfffd,0x3064,0x30ef,0x305c,0x306b, + 0xfffd,0x30ca,0x3085,0x3067,0x30ea,0x30c2,0x30c8,0xfffd, + 0x30f5,0xfffd,0xfffd,0xfffd,0x30ca,0xfffd,0x3050,0x30f1, + 0x3050,0x3053,0x3072,0xfffd,0xfffd,0xfffd,0x3074,0xfffd, + 0x304b,0x30dd,0x306d,0xfffd,0x3049,0x30a1,0x30cc,0x30de, + 0x30ae,0x307b,0x308a,0xfffd,0x3065,0xfffd,0xfffd,0x30c0, + 0xfffd,0x3048,0x30dc,0x304f,0x3085,0x3059,0x304b,0x30d3, + 0x30eb,0x30a4,0x3073,0xfffd,0x30ba,0x308f,0x30a7,0x30c3, + 0x3074,0x30cf,0x306c,0x3053,0x30c0,0xfffd,0x3066,0xfffd, + 0x308f,0xfffd,0x30b5,0xfffd,0x3092,0x30c4,0xfffd,0x30d6, + 0x3056,0x30ad,0x30d2,0x30ba,0xfffd,0x30e6,0x304c,0x3088, + 0x30b6,0x3048,0x3077,0x30d1,0xfffd,0x3050,0xfffd,0x3042, + 0xfffd,0xfffd,0x308f,0xfffd,0x30c1,0xfffd,0x3074,0x3061, + 0x3056,0x30e5,0xfffd,0xfffd,0x3057,0xfffd,0xfffd,0xfffd, + 0xfffd,0x30bd,0x30b3,0x30ee,0xfffd,0x30f2,0x3084,0x3050, + 0xfffd,0x30e7,0xfffd,0xfffd,0x3060,0x3049,0x30f2,0x30ad, + 0x30bf,0x30f1,0x30a2,0xfffd,0x30af,0xfffd,0x3060,0x30a1, + 0x30e9,0x30c3,0xfffd,0x3072,0x3093,0x3070,0xfffd,0x308f, + 0x3060,0xfffd,0x3067,0x306f,0x3082,0x308b,0x3051,0xfffd, + 0x3058,0xfffd,0xfffd,0x30a8,0x3051,0x3054,0x30ad,0x30f0, + 0x3053,0xfffd,0x30e1,0x30d7,0x308d,0x307f,0x30be,0x30b0, + 0xfffd,0x30db,0xfffd,0x30d1,0xfffd,0x3054,0x30a5,0xfffd, + 0x306a,0xfffd,0x305c,0xfffd,0x3052,0x3088,0xfffd,0x306e, + 0xfffd,0x30a9,0x30a1,0x30b4,0x3083,0x30bd,0xfffd,0xfffd, + 0x306a,0x3070,0x30cd,0xfffd,0x3072,0x30ed,0x30c6,0x30be, + 0x30c4,0x305e,0x30b3,0x30e1,0x308a,0xfffd,0x305b,0xfffd, + 0x3042,0x3088,0xfffd,0x304c,0xfffd,0x3089,0x3071,0xfffd, + 0xfffd,0x30c6,0x3062,0x3079,0xfffd,0x304b,0x304a,0xfffd, + 0x30ad,0x3045,0x3045,0x3087,0xfffd,0x306a,0x308b,0x0000, + 0x30bd,0x3065,0x30b8,0x3086,0x30d3,0x3076,0xfffd,0xfffd, + 0x308f,0x3053,0x307c,0x3053,0x3084,0x30ae,0x30c4,0x3045, + 0x30a8,0x30d0,0x30e1,0x308c,0x30e6,0x30b7,0xfffd,0xfffd, + 0xfffd,0x3046,0x305f,0xfffd,0x3086,0x30ab,0xfffd,0xfffd, + 0x30c8,0xfffd,0x30a1,0x3052,0x3059,0xfffd,0x30a4,0xfffd, + 0xfffd,0x308c,0x3085,0x30ab,0x30b5,0x3091,0x30bf,0x30e3, + 0xfffd,0xfffd,0x3087,0xfffd,0x30f6,0x3051,0x30bd,0x3092, + 0x3063,0xfffd,0x30a9,0x3063,0x306e,0xfffd,0xfffd,0xfffd, + 0x306c,0xfffd,0x307e,0x30ad,0x3077,0x30c2,0x30e9,0x30d5, + 0xfffd,0xfffd,0x30c6,0x305c,0xfffd,0xfffd,0x3089,0xfffd, + 0x3048,0x30cb,0x308c,0xfffd,0xfffd,0x3044,0xfffd,0x3080, + 0x3063,0x3079,0xfffd,0x308a,0x30cb,0x3042,0x3057,0xfffd, + 0x307c,0x30c1,0x30a8,0x30cf,0xfffd,0x3083,0xfffd,0xfffd, + 0x306c,0xfffd,0x305e,0x3092,0xfffd,0x30dc,0x30b0,0x3081, + 0x30e3,0x30f0,0x304e,0x30cc,0x308e,0x30c4,0x30ad + }; + + UErrorCode status = U_ZERO_ERROR; + UCollator *pCollator; + int32_t lenActualSortKey; + uint8_t pucSortKey[4096]; + static const int32_t LENSORTKEY = (int32_t)sizeof(pucSortKey); + + ucol_prepareShortStringOpen("LFR_AN_CX_EX_FO_HX_NX_S3", 0, NULL, &status); + + pCollator = ucol_openFromShortString("LFR_AN_CX_EX_FO_HX_NX_S3", 0, NULL, &status); + + if (U_FAILURE(status)) { + log_err("error opening collator\n"); + return; + } + + lenActualSortKey = ucol_getSortKey(pCollator, + (const UChar *)pucUTF16, + sizeof(pucUTF16) / sizeof(pucUTF16[0]), // in # of UChars + pucSortKey, + LENSORTKEY); // in # of bytes + + if (lenActualSortKey > LENSORTKEY) { + log_err("sort key too big for original buffer. Got: %d Expected: %d\n", lenActualSortKey, LENSORTKEY); + return; + } + /* If the test didn't crash, then the test succeeded. */ + ucol_close(pCollator); +} + #endif /* #if !UCONFIG_NO_COLLATION */