Skip to content

[iOS][HybridGlobalization] Handle small buffer case in sortkey #106062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 9, 2024
Merged

[iOS][HybridGlobalization] Handle small buffer case in sortkey #106062

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1af78e0
handle small buffer case in sortkey
mkhamoyan Aug 7, 2024
885493c
feedback
mkhamoyan Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/native/libs/System.Globalization.Native/pal_collation.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ int32_t GlobalizationNative_GetSortKeyNative(const uint16_t* localeName, int32_t
@autoreleasepool {
if (cwStrLength == 0)
{
if (sortKey != NULL)
if (sortKey != NULL && cbSortKeyLength > 0)
sortKey[0] = '\0';
return 1;
}
Expand All @@ -343,7 +343,7 @@ int32_t GlobalizationNative_GetSortKeyNative(const uint16_t* localeName, int32_t
// If the string is empty after removing weightless characters, return 1
if(sourceStringCleaned.length == 0)
{
if (sortKey != NULL)
if (sortKey != NULL && cbSortKeyLength > 0)
sortKey[0] = '\0';
return 1;
}
Expand All @@ -357,13 +357,16 @@ int32_t GlobalizationNative_GetSortKeyNative(const uint16_t* localeName, int32_t
NSUInteger transformedStringBytes = [transformedString lengthOfBytesUsingEncoding: NSUTF16StringEncoding];
if (sortKey == NULL)
return (int32_t)transformedStringBytes;

// If the buffer is too small, return the required buffer size
// and throw exception in managed code
if (cbSortKeyLength < (int32_t)transformedStringBytes)
return (int32_t)transformedStringBytes;
NSRange range = NSMakeRange(0, [transformedString length]);
NSUInteger usedLength = 0;
BOOL result = [transformedString getBytes:sortKey maxLength:transformedStringBytes usedLength:&usedLength encoding:NSUTF16StringEncoding options:0 range:range remainingRange:NULL];
if (result)
return (int32_t)usedLength;

(void)cbSortKeyLength; // ignore unused parameter
return 0;
}
}
Expand Down