From 9f5cf1f54677cea771505a8f14e13fb248ad2e83 Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Wed, 8 May 2013 17:33:54 +0000
Subject: [PATCH] ICU-10129 Fix Windows timezone name truncation

X-SVN-Rev: 33610
---
 icu4c/source/common/wintz.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/icu4c/source/common/wintz.c b/icu4c/source/common/wintz.c
index addf76ba88..0af6dc4c13 100644
--- a/icu4c/source/common/wintz.c
+++ b/icu4c/source/common/wintz.c
@@ -1,6 +1,6 @@
 /*
 ********************************************************************************
-*   Copyright (C) 2005-2012, International Business Machines
+*   Copyright (C) 2005-2013, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
@@ -254,7 +254,6 @@ uprv_detectWindowsTimeZone() {
     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 @@ uprv_detectWindowsTimeZone() {
 
     /* 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;