diff options
| author | Isamu Mogi <saturday6c@gmail.com> | 2013-04-27 23:41:45 +0900 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-05-02 15:11:29 +0000 |
| commit | 263ab3f14bbb8cea9f5a1b8ea7496f6a23e6c547 (patch) | |
| tree | 13f0eec28e46bc2f91ee062276627226823bfac6 | |
| parent | f13f3b42eb113ead6fcffba39e8fcfb31808627d (diff) | |
fdo#59850: Resolves invalid date changing by ICU's timezone detection bug.
Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
of which the outcome should be monitored.
Change-Id: I3ebd4aaef281214062a5b2a858eff8e57a34c9b1
Reviewed-on: https://gerrit.libreoffice.org/3637
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | icu/UnpackedTarball_icu.mk | 1 | ||||
| -rw-r--r-- | icu/icu4c.10129.wintz.patch | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk index 35c95c498ad2..e0837ace8893 100644 --- a/icu/UnpackedTarball_icu.mk +++ b/icu/UnpackedTarball_icu.mk @@ -12,6 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu)) $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,icu,\ + icu/icu4c.10129.wintz.patch \ icu/icu4c.9948.mlym-crash.patch \ icu/icu4c-build.patch \ icu/icu4c.8198.revert.icu5431.patch \ diff --git a/icu/icu4c.10129.wintz.patch b/icu/icu4c.10129.wintz.patch new file mode 100644 index 000000000000..1c6ace908425 --- /dev/null +++ b/icu/icu4c.10129.wintz.patch @@ -0,0 +1,24 @@ +# 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 ++++ misc/build/icu/source/common/wintz.c +@@ -254,7 +254,6 @@ + char apiStdName[MAX_LENGTH_ID]; + char regStdName[MAX_LENGTH_ID]; + char tmpid[MAX_LENGTH_ID]; +- int32_t apiStdLength = 0; + int32_t len; + int id; + int errorCode; +@@ -280,8 +279,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; |