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

ICU-10808 Fix some array size limitation when calling pkgdata tool

Browse Source 
X-SVN-Rev: 35648
This commit is contained in:
Michael Ow 2014-04-23 21:29:23 +00:00
parent e22cfd6ac1
commit 3cc66e5be4
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icu4c/source/tools/toolutil/package.h
View File

@ -1,7 +1,7 @@
/*
*******************************************************************************
*
* Copyright (C) 2005-2013, International Business Machines
* Copyright (C) 2005-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@ -26,7 +26,7 @@
// .dat package file representation ---------------------------------------- ***
#define STRING_STORE_SIZE 100000
#define MAX_PKG_NAME_LENGTH 32
#define MAX_PKG_NAME_LENGTH 64
typedef void CheckDependency(void *context, const char *itemName, const char *targetName);

4
icu4c/source/tools/toolutil/pkg_genc.c
View File

@ -1,5 +1,5 @@
/******************************************************************************
* Copyright (C) 2009-2013, International Business Machines
* Copyright (C) 2009-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*******************************************************************************
*/
@ -761,7 +761,7 @@ getArchitecture(uint16_t *pCPU, uint16_t *pBits, UBool *pIsBigEndian, const char
U_CAPI void U_EXPORT2
writeObjectCode(const char *filename, const char *destdir, const char *optEntryPoint, const char *optMatchArch, const char *optFilename, char *outFilePath) {
/* common variables */
char buffer[4096], entry[40]={ 0 };
char buffer[4096], entry[96]={ 0 };
FileStream *in, *out;
const char *newSuffix;
int32_t i, entryLength, length, size, entryOffset=0, entryLengthOffset=0;

5
icu4c/source/tools/toolutil/toolutil.cpp
View File

@ -162,7 +162,10 @@ findBasename(const char *filename) {
const char *basename=uprv_strrchr(filename, U_FILE_SEP_CHAR);
#if U_FILE_ALT_SEP_CHAR!=U_FILE_SEP_CHAR
if(basename==NULL) {
#if !U_PLATFORM_USES_ONLY_WIN32_API && U_PLATFORM != U_PF_CYGWIN
if(basename==NULL)
#endif
{
/* Use lenient matching on Windows, which can accept either \ or /
This is useful for environments like Win32+CygWin which have both.
*/