Aren/haiku
1
0
Fork 0
Code Issues Pull Requests 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 <b.vitruvio@gmail.com>
This commit is contained in:
Murai Takashi 2019-01-30 19:53:17 +09:00 committed by Barrett17
parent f9c74ffa6f
commit 7db28d3803
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/kits/locale/Collator.cpp
View File

@ -142,9 +142,14 @@ BCollator::GetSortKey(const char* string, BString* key) const
int requiredSize = fICUCollator->getSortKey(UnicodeString(string, length,
NULL, error), buffer, length * 2);
if (requiredSize > length * 2) {
buffer = (uint8_t*)realloc(buffer, requiredSize);
if (buffer == NULL)
uint8_t* tmpBuffer = (uint8_t*)realloc(buffer, requiredSize);
if (tmpBuffer == NULL) {
free(buffer);
buffer = NULL;
return B_NO_MEMORY;
} else {
buffer = tmpBuffer;
}
error = U_ZERO_ERROR;
fICUCollator->getSortKey(UnicodeString(string, length, NULL, error),