AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1075 Memory leak fixed; was introduced in previous fix to extendICUData()

Browse Source 
X-SVN-Rev: 6120
This commit is contained in:
Andy Heninger 2001-10-08 17:41:04 +00:00
parent a712c02b2b
commit f0ce390506
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
icu4c/source/common/udata.c
View File

@ -470,6 +470,7 @@ static UBool extendICUData(UDataMemory *failedData, UErrorCode *pErr)
* TOC, which is how we identify it here.
*/
UDataMemory *pData;
UDataMemory copyPData;
if (failedData->vFuncs->NumEntries(failedData) > 0) {
/* Not the stub. We can't extend. */
@ -484,22 +485,23 @@ static UBool extendICUData(UDataMemory *failedData, UErrorCode *pErr)
/* How about if there is no pData, eh... */
if(pData != NULL) {
pData->map = 0; /* The mapping for this data is owned by the hash table */
pData->mapAddr = 0; /* which will unmap it when ICU is shut down. */
UDataMemory_init(&copyPData);
if(pData != NULL) {
UDatamemory_assign(&copyPData, pData);
copyPData.map = 0; /* The mapping for this data is owned by the hash table */
copyPData.mapAddr = 0; /* which will unmap it when ICU is shut down. */
/* CommonICUData is also unmapped when ICU is shut down.*/
/* To avoid unmapping the data twice, zero out the map */
/* fields in the UDataMemory that we're assigning */
/* to CommonICUData. */
setCommonICUData(&copyPData, /* The new common data. */
failedData, /* Old ICUData ptr. Overwrite of this value is ok, */
FALSE, /* No warnings if write didn't happen */
pErr); /* setCommonICUData honors errors; NOP if error set */
}
setCommonICUData(pData, /* The new common data. */
failedData, /* Old ICUData ptr. Overwrite of this value is ok, */
FALSE, /* No warnings if write didn't happen */
pErr); /* setCommonICUData honors errors; NOP if error set */
return gCommonICUData != failedData; /* Return true if ICUData pointer was updated. */
/* (Could potentialy have been done by another thread racing */
/* us through here, but that's fine, we still return true */