icu/icu4c.10129.wintz.patch

   1 # Fix for fdo#59850
   2 # Patch was also submitted with https://ssl.icu-project.org/trac/ticket/10129
   3 # of which the outcome should be monitored.
   4
   5 --- misc/icu/source/common/wintz.c
   6 +++ misc/build/icu/source/common/wintz.c
   7 @@ -254,7 +254,6 @@
   8      char apiStdName[MAX_LENGTH_ID];
   9      char regStdName[MAX_LENGTH_ID];
  10      char tmpid[MAX_LENGTH_ID];
  11 -    int32_t apiStdLength = 0;
  12      int32_t len;
  13      int id;
  14      int errorCode;
  15 @@ -280,8 +279,8 @@
  16
  17      /* Convert the wchar_t* standard name to char* */
  18      uprv_memset(apiStdName, 0, sizeof(apiStdName));
  19 -    u_strFromWCS(apiStd, MAX_LENGTH_ID, &apiStdLength, apiTZI.StandardName, -1, &status);
  20 -    u_austrncpy(apiStdName, apiStd, apiStdLength);
  21 +    u_strFromWCS(apiStd, MAX_LENGTH_ID, NULL, apiTZI.StandardName, -1, &status);
  22 +    u_austrncpy(apiStdName, apiStd, sizeof(apiStdName) - 1);
  23
  24      tmpid[0] = 0;