organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

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

Browse source 
The tool pkgdata uses snprintf() to build the strings of the commands that
will execute later during the install process. But the maximum size of this
buffers is not enough when there is a long path.

This has caused issues on some CI systems that use very long paths, causing
the install process to produce a wrong result.

The maximum path on Linux is 4096 (defined as PATH_MAX at <linux/limits.h>)
So the size of SMALL_BUFFER_MAX_SIZE should be 4096 to avoid errors related
to truncated paths.
This commit is contained in:
Carlos Alberto Lopez Perez 2024-07-01 22:15:18 +01:00 • committed by Markus Scherer
parent 4acb4724cf
commit 8ca6bc7545
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
icu4c/source/tools/pkgdata/pkgdata.cpp
View file

@ -1140,7 +1140,7 @@ normal_symlink_mode:
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),
@ -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;
@ -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;

5
icu4c/source/tools/toolutil/pkg_genc.h
View file

@ -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 **/