organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 3

ICU-4703 Fix memory leaks when functions start failing, and fix a threading issue.

Browse source 
X-SVN-Rev: 19460
This commit is contained in:
George Rhoten 2006-03-28 04:08:34 +00:00
parent 40e798da6d
commit d96b2b6088
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
icu4c/source/common/usprep.cpp
View file

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2005, International Business Machines
* Copyright (C) 2003-2006, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -317,7 +317,9 @@ usprep_getProfile(const char* path,
stackKey.path = (char*) path;
/* fetch the data from the cache */
umtx_lock(&usprepMutex);
profile = (UStringPrepProfile*) (uhash_get(SHARED_DATA_HASHTABLE,&stackKey));
umtx_unlock(&usprepMutex);
if(profile == NULL){
UStringPrepKey* key = (UStringPrepKey*) uprv_malloc(sizeof(UStringPrepKey));
@ -356,7 +358,7 @@ usprep_getProfile(const char* path,
key->path = (char*) uprv_malloc(uprv_strlen(path)+1);
if(key->path == NULL){
*status = U_MEMORY_ALLOCATION_ERROR;
uprv_free(key->path);
uprv_free(key->name);
uprv_free(key);
uprv_free(profile);
return NULL;
@ -366,6 +368,10 @@ usprep_getProfile(const char* path,
/* load the data */
if(!loadData(profile, path, name, _SPREP_DATA_TYPE, status) || U_FAILURE(*status) ){
uprv_free(key->path);
uprv_free(key->name);
uprv_free(key);
uprv_free(profile);
return NULL;
}
@ -378,6 +384,7 @@ usprep_getProfile(const char* path,
if(U_FAILURE(*status)) {
usprep_unload(profile);
uprv_free(key->path);
uprv_free(key->name);
uprv_free(key);
uprv_free(profile);
return NULL;