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

ICU-1779 Better fix for malloc(0)

Browse Source 
X-SVN-Rev: 8093
This commit is contained in:
George Rhoten 2002-03-18 21:53:11 +00:00
parent 26516e852e
commit f2aadf39e9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
icu4c/source/common/uvector.cpp
View File

@ -32,10 +32,6 @@ UVector::UVector(int32_t initialCapacity, UErrorCode &status) :
deleter(0), deleter(0),
comparer(0) comparer(0)
{ {
// Fix bogus initialCapacity values; avoid malloc(0)
if (initialCapacity < 1) {
initialCapacity = 1;
}
_init(initialCapacity, status); _init(initialCapacity, status);
} }
@ -60,6 +56,10 @@ UVector::UVector(UObjectDeleter d, UKeyComparator c, int32_t initialCapacity, UE
} }
void UVector::_init(int32_t initialCapacity, UErrorCode &status) { void UVector::_init(int32_t initialCapacity, UErrorCode &status) {
// Fix bogus initialCapacity values; avoid malloc(0)
if (initialCapacity < 1) {
initialCapacity = DEFUALT_CAPACITY;
}
elements = (UHashTok *)uprv_malloc(sizeof(UHashTok)*initialCapacity); elements = (UHashTok *)uprv_malloc(sizeof(UHashTok)*initialCapacity);
if (elements == 0) { if (elements == 0) {
status = U_MEMORY_ALLOCATION_ERROR; status = U_MEMORY_ALLOCATION_ERROR;