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

ICU-9322 Fix some memory check errors in ICU tools

Browse Source 
X-SVN-Rev: 31829
This commit is contained in:
Michael Ow 2012-05-17 19:58:22 +00:00
parent 5d2a5e6fa3
commit 671a7be44b
13 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/Makefile.in
View File

@ -226,7 +226,7 @@ config/icucross.mk: $(top_builddir)/icudefs.mk $(top_builddir)/Makefile
@(echo 'TOOLBINDIR=$$(cross_buildroot)/bin' ;\
echo 'TOOLLIBDIR=$$(cross_buildroot)/lib' ;\
echo "INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)"'$$(TOOLLIBDIR):$$(cross_buildroot)/stubdata:$$(cross_buildroot)/tools/ctestfw:$$$$'"$(LDLIBRARYPATH_ENVVAR)" ;\
echo "PKGDATA_INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)"'$$(cross_buildroot)/stubdata:$$(cross_buildroot)/tools/ctestfw:$$(TOOLLIBDIR):$$$$'"$(LDLIBRARYPATH_ENVVAR) "'$$'"(PKGDATA_INVOKE_OPTS)" ;\
echo "PKGDATA_INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)"'$$(cross_buildroot)/stubdata:$$(cross_buildroot)/tools/ctestfw:$$(TOOLLIBDIR):$$$$'"$(LDLIBRARYPATH_ENVVAR) " ;\
echo ) >> $@

2
icu4c/source/extra/uconv/uconv.cpp
View File

@ -1380,6 +1380,8 @@ normal_exit:
fclose(outfile);
}
u_cleanup();
return ret;
}

7
icu4c/source/i18n/ucol_bld.cpp
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2001-2011, International Business Machines
* Copyright (C) 2001-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -743,6 +743,11 @@ U_CFUNC void ucol_initBuffers(UColTokenParser *src, UColTokListHeader *lh, UErro
uprv_memset(t, 0, UCOL_STRENGTH_LIMIT*sizeof(uint32_t));
/* must initialize ranges to avoid memory check warnings */
for (int i = 0; i < UCOL_CE_STRENGTH_LIMIT; i++) {
uprv_memset(Gens[i].ranges, 0, sizeof(Gens[i].ranges));
}
tok->toInsert = 1;
t[tok->strength] = 1;

4
icu4c/source/icudefs.mk.in
View File

@ -77,8 +77,6 @@ ICUPKGDATA_DIR = $(ICUDATA_DIR)
endif
endif
endif
# This is needed so that make -j2 doesn't complain when invoking pkgdata's make
PKGDATA_INVOKE_OPTS = MAKEFLAGS=
# These are defined here because mh-cygwin-msvc needs to override these values.
ICUPKGDATA_INSTALL_DIR = $(DESTDIR)$(ICUPKGDATA_DIR)
@ -259,7 +257,7 @@ LIBICUIO = $(LLIBDIR) $(ICULIBS_IO)
# overridden by icucross.mk
INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)$(LIBDIR):$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
# prefer stubdata
PKGDATA_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$(LIBRARY_PATH_PREFIX)$(LIBDIR):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER) $(PKGDATA_INVOKE_OPTS)
PKGDATA_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$(LIBRARY_PATH_PREFIX)$(LIBDIR):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
INSTALLED_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR)
# Platform-specific setup

13
icu4c/source/tools/gencnval/gencnval.c
View File

@ -217,6 +217,7 @@ static UOption options[]={
extern int
main(int argc, char* argv[]) {
int i, n;
char pathBuf[512];
FileStream *in;
UNewDataMemory *out;
@ -305,6 +306,15 @@ main(int argc, char* argv[]) {
exit(errorCode);
}
/* clean up tags */
for (i = 0; i < MAX_TAG_COUNT; i++) {
for (n = 0; n < MAX_CONV_COUNT; n++) {
if (tags[i].aliasList[n].aliases!=NULL) {
uprv_free(tags[i].aliasList[n].aliases);
}
}
}
return 0;
}
@ -1052,8 +1062,9 @@ writeAliasTable(UNewDataMemory *out) {
uprv_free(normalizedStrings);
}
uprv_free(aliasArrLists);
uprv_free(uniqueAliasesToConverter);
uprv_free(uniqueAliases);
uprv_free(aliasArrLists);
}
static char *

2
icu4c/source/tools/genrb/genrb.c
View File

@ -435,6 +435,8 @@ main(int argc,
}
}
u_cleanup();
/* Dont return warnings as a failure */
if (U_SUCCESS(status)) {
return 0;

4
icu4c/source/tools/genrb/parse.cpp
View File

@ -139,7 +139,7 @@ static void
cleanupLookahead(ParseState* state)
{
uint32_t i;
for (i = 0; i < MAX_LOOKAHEAD; i++)
for (i = 0; i <= MAX_LOOKAHEAD; i++)
{
ustr_deinit(&state->lookahead[i].value);
ustr_deinit(&state->lookahead[i].comment);
@ -1764,6 +1764,8 @@ parseInclude(ParseState* state, char *tag, uint32_t startline, const struct UStr
uBuffer = ucbuf_getBuffer(ucbuf,&len,status);
result = string_open(state->bundle, tag, uBuffer, len, comment, status);
ucbuf_close(ucbuf);
uprv_free(pTarget);
uprv_free(filename);

6
icu4c/source/tools/genrb/reslist.c
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2000-2011, International Business Machines
* Copyright (C) 2000-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -1173,6 +1173,10 @@ static void bin_close(struct SResource *binres) {
uprv_free(binres->u.fBinaryValue.fData);
binres->u.fBinaryValue.fData = NULL;
}
if (binres->u.fBinaryValue.fFileName != NULL) {
uprv_free(binres->u.fBinaryValue.fFileName);
binres->u.fBinaryValue.fFileName = NULL;
}
}
void res_close(struct SResource *res) {

4
icu4c/source/tools/gensprep/gensprep.c
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2009, International Business Machines
* Copyright (C) 2003-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -262,6 +262,8 @@ main(int argc, char* argv[]) {
uprv_free(filename);
u_cleanup();
#endif
return errorCode;

5
icu4c/source/tools/gensprep/store.c
View File

@ -332,6 +332,7 @@ storeMappingData(){
}else{
/* realloc */
UChar* newMappingData = (uint16_t*) uprv_malloc(U_SIZEOF_UCHAR * mappingDataCapacity*2);
uprv_memset(newMappingData, 0, U_SIZEOF_UCHAR * mappingDataCapacity*2); /* must initialize to avoid memory check warnings */
if(newMappingData == NULL){
fprintf(stderr, "Could not realloc the mapping data!\n");
exit(U_MEMORY_ALLOCATION_ERROR);
@ -650,13 +651,15 @@ generateData(const char *dataDir, const char* bundleName) {
uhash_close(hashTable);
}
#endif
uprv_free(fileName);
}
#if !UCONFIG_NO_IDNA
extern void
cleanUpData(void) {
uprv_free(mappingData);
utrie_close(sprepTrie);
uprv_free(sprepTrie);
}

4
icu4c/source/tools/icuinfo/Makefile.in
View File

@ -1,5 +1,5 @@
## Makefile.in for ICU - tools/icuinfo
## Copyright (c) 1999-2011, International Business Machines Corporation and
## Copyright (c) 1999-2012, International Business Machines Corporation and
## others. All Rights Reserved.
## Madhu Katragadda
@ -31,7 +31,7 @@ DEPS = $(OBJECTS:.o=.d)
# pass some information
ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME) -x $(top_builddir)/config/icuinfo.xml -v
ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME) -x $(top_builddir)/config/icuinfo.xml -v -K
## List of phony targets
.PHONY : all all-local install install-local clean clean-local \

3
icu4c/source/tools/makeconv/gencnvex.c
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2007, International Business Machines
* Copyright (C) 2003-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -100,6 +100,7 @@ CnvExtClose(NewConverter *cnvData) {
utm_close(extData->fromUTableUChars);
utm_close(extData->fromUTableValues);
utm_close(extData->fromUBytes);
uprv_free(extData);
}
}

6
icu4c/source/tools/toolutil/ucm.c
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2003-2009, International Business Machines
* Copyright (C) 2003-2012, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -1030,8 +1030,8 @@ ucm_open() {
U_CAPI void U_EXPORT2
ucm_close(UCMFile *ucm) {
if(ucm!=NULL) {
uprv_free(ucm->base);
uprv_free(ucm->ext);
ucm_closeTable(ucm->base);
ucm_closeTable(ucm->ext);
uprv_free(ucm);
}
}