Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3636

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3636/1

fdo#52519: Resolves invalid date changing by ICU's timezone detection bug.

Change-Id: I687bb3838cc5c4034f270c0d8056eba011e80341
---
M icu/UnpackedTarball_icu.mk
A icu/icu4c.10129.wintz.patch
2 files changed, 21 insertions(+), 0 deletions(-)



diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk
index 35c95c4..e0837ac 100644
--- a/icu/UnpackedTarball_icu.mk
+++ b/icu/UnpackedTarball_icu.mk
@@ -12,6 +12,7 @@
 $(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 0000000..14349f3
--- /dev/null
+++ b/icu/icu4c.10129.wintz.patch
@@ -0,0 +1,20 @@
+--- 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, MAX_LENGTH_ID);
+
+     tmpid[0] = 0;

-- 
To view, visit https://gerrit.libreoffice.org/3636
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I687bb3838cc5c4034f270c0d8056eba011e80341
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Isamu Mogi <saturday6c@gmail.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.