Kaydet (Commit) 263ab3f1 authored tarafından Isamu Mogi's avatar Isamu Mogi Kaydeden (comit) Eike Rathke

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/3637Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarEike Rathke <erack@redhat.com>
üst f13f3b42
......@@ -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 \
......
# 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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment