i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kits/locale: Fix PVS 495

Browse Source 
Fix memory leak when realloc() fails.

Change-Id: I9062bb177919805e9973c5afd6bc01f8fbb753b6
Reviewed-on: https://review.haiku-os.org/c/1016
Reviewed-by: Barrett17 <[email protected]>
This commit is contained in:
Murai Takashi
2019-02-07 11:43:00 +00:00
committed by Barrett17
parent f9c74ffa6f
commit 7db28d3803
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/locale/Collator.cpp
+7 -2
View File
@@ -142,9 +142,14 @@ BCollator::GetSortKey(const char* string, BString* key) const
int requiredSize = fICUCollator->getSortKey(UnicodeString(string, length, int requiredSize = fICUCollator->getSortKey(UnicodeString(string, length,
NULL, error), buffer, length * 2); NULL, error), buffer, length * 2);
if (requiredSize > length * 2) { if (requiredSize > length * 2) {
buffer = (uint8_t*)realloc(buffer, requiredSize); uint8_t* tmpBuffer = (uint8_t*)realloc(buffer, requiredSize);
if (buffer == NULL) if (tmpBuffer == NULL) {
free(buffer);
buffer = NULL;
return B_NO_MEMORY; return B_NO_MEMORY;
} else {
buffer = tmpBuffer;
}
error = U_ZERO_ERROR; error = U_ZERO_ERROR;
fICUCollator->getSortKey(UnicodeString(string, length, NULL, error), fICUCollator->getSortKey(UnicodeString(string, length, NULL, error),