diff options
-rw-r--r-- | icu/icu4c.10129.wintz.patch | 26 | ||||
-rw-r--r-- | icu/makefile.mk | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/icu/icu4c.10129.wintz.patch b/icu/icu4c.10129.wintz.patch new file mode 100644 index 000000000000..d365f5e669af --- /dev/null +++ b/icu/icu4c.10129.wintz.patch @@ -0,0 +1,26 @@ + +# Fix for fdo#59850 +# Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129 +# of which the outcome should be monitored. + +--- misc/icu/source/common/wintz.c 2012-04-05 20:46:14.000000000 +0000 ++++ misc/build/icu/source/common/wintz.c 2013-05-03 13:00:47.188384300 +0000 +@@ -255,7 +255,6 @@ + char apiStdName[MAX_LENGTH_ID]; + char regStdName[MAX_LENGTH_ID]; + char tmpid[MAX_LENGTH_ID]; +- int32_t apiStdLength = 0; + int32_t len; + + LONG result; +@@ -278,8 +277,8 @@ + + /* Convert the wchar_t* standard name to char* */ + uprv_memset(apiStdName, 0, sizeof(apiStdName)); +- u_strFromWCS(apiStd, MAX_LENGTH_ID, &apiStdLength, apiTZI.StandardName, -1, &status); +- u_austrncpy(apiStdName, apiStd, apiStdLength); ++ u_strFromWCS(apiStd, MAX_LENGTH_ID, NULL, apiTZI.StandardName, -1, &status); ++ u_austrncpy(apiStdName, apiStd, sizeof(apiStdName) - 1); + + tmpid[0] = 0; + diff --git a/icu/makefile.mk b/icu/makefile.mk index 98708df4fb39..1f6e8e8f5652 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -46,6 +46,7 @@ TARFILE_ROOTDIR=icu #http://bugs.icu-project.org/trac/ticket/8198 rendering with 0D30 and 0D31 PATCH_FILES=\ + icu4c.10129.wintz.patch \ icu4c.9948.mlym-crash.patch \ icu4c-bsd.patch \ icu4c-build.patch \ |