Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ICU-22813 Rise the size of the buffers used for the command strings at pkgdata #3058

Merged
merged 1 commit into from
Jul 19, 2024
Merged

ICU-22813 Rise the size of the buffers used for the command strings at pkgdata #3058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions icu4c/source/tools/pkgdata/pkgdata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@ static int32_t pkg_createSymLinks(const char *targetDir, UBool specialHandling)

static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) {
int32_t result = 0;
char cmd[SMALL_BUFFER_MAX_SIZE * 2];
char cmd[LARGE_BUFFER_MAX_SIZE];

auto ret = snprintf(cmd,
sizeof(cmd),
Expand Down Expand Up @@ -1211,7 +1211,7 @@ static int32_t pkg_installLibrary(const char *installDir, const char *targetDir,

static int32_t pkg_installCommonMode(const char *installDir, const char *fileName) {
int32_t result = 0;
char cmd[SMALL_BUFFER_MAX_SIZE] = "";
char cmd[LARGE_BUFFER_MAX_SIZE] = "";

if (!T_FileStream_file_exists(installDir)) {
UErrorCode status = U_ZERO_ERROR;
Expand Down Expand Up @@ -1243,7 +1243,7 @@ static int32_t pkg_installCommonMode(const char *installDir, const char *fileNam
#endif
static int32_t pkg_installFileMode(const char *installDir, const char *srcDir, const char *fileListName) {
int32_t result = 0;
char cmd[SMALL_BUFFER_MAX_SIZE] = "";
char cmd[LARGE_BUFFER_MAX_SIZE] = "";

if (!T_FileStream_file_exists(installDir)) {
UErrorCode status = U_ZERO_ERROR;
Expand Down
5 changes: 2 additions & 3 deletions icu4c/source/tools/toolutil/pkg_genc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@
#define PKGDATA_FILE_SEP_STRING U_FILE_SEP_STRING
#endif

#define LARGE_BUFFER_MAX_SIZE 2048
#define SMALL_BUFFER_MAX_SIZE 512
#define SMALL_BUFFER_FLAG_NAMES 32
#define LARGE_BUFFER_MAX_SIZE 16384
#define SMALL_BUFFER_MAX_SIZE 4096
#define BUFFER_PADDING_SIZE 20

/** End platform defines **/
Expand Down