mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

icu: Use LARGE_BUFFER_MAX_SIZE for cmd

Browse Source 
The previous patch used LARGE_BUFFER_MAX_SIZE instead
of SMALL_BUFFER_MAX_SIZE for cmd in function pkg_installLibrary,
which only fixed some of the cases when the command line
is too long, some other cases indicate that the
LARGE_BUFFER_MAX_SIZE is also needed in pkg_installCommonMode
and pkg_installFileMode to avoid overflow:

| *** buffer overflow detected ***: ../bin/pkgdata terminated

(From OE-Core rev: 2c3ec6b3c4e8faf9cf88ae33727b4fecef83d0f8)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jackie Huang
2017-05-10 14:29:11 +08:00
committed by Richard Purdie
parent 29c426b886
commit c6e8ce8530
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/icu/icu/icu-pkgdata-large-cmd.patch
+24 -4
View File
@@ -8,14 +8,16 @@ LARGE_BUFFER_MAX_SIZE.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
tools/pkgdata/pkgdata.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
tools/pkgdata/pkgdata.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp
index 60167dd..506dd32 100644
--- a/tools/pkgdata/pkgdata.cpp
+++ b/tools/pkgdata/pkgdata.cpp
@@ -1019,7 +1019,7 @@ normal_symlink_mode:
@@ -1084,7 +1084,7 @@ normal_symlink_mode:
static int32_t pkg_installLibrary(const char *installDir, const char *targetDir, UBool noVersion) {
int32_t result = 0;
@@ -24,6 +26,24 @@ diff --git a/tools/pkgdata/pkgdata.cpp b/tools/pkgdata/pkgdata.cpp
sprintf(cmd, "cd %s && %s %s %s%s%s",
targetDir,
@@ -1152,7 +1152,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;
@@ -1184,7 +1184,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;
--
1.7.10.4
1.9.1