AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-4911 Fix a memory leak

Browse Source 
X-SVN-Rev: 18756
This commit is contained in:
George Rhoten 2005-11-04 19:19:45 +00:00
parent 91114f6145
commit d1f265499b
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
icu4c/source/common/putil.c
View File

@ -1213,7 +1213,8 @@ extern U_IMPORT char *U_TZNAME[];
#if defined(U_DARWIN) /* For Mac OS X */
#define TZZONELINK "/etc/localtime"
#define TZZONEINFO "/usr/share/zoneinfo/"
static char *gTimeZoneBuffer = NULL; /* Heap allocated */
static char gTimeZoneBuffer[MAXPATHLEN + 2]; /* Heap allocated */
static char *gTimeZoneBufferPtr = NULL;
#endif
U_CAPI const char* U_EXPORT2
@ -1224,11 +1225,8 @@ uprv_tzname(int n)
if (id != NULL) {
return id;
}
#endif
#if defined(U_DARWIN)
#elif defined(U_DARWIN)
int ret;
char *tzenv;
tzenv = getenv("TZFILE");
@ -1236,6 +1234,18 @@ uprv_tzname(int n)
return tzenv;
}
/* Caller must handle threading issues */
if (gTimeZoneBufferPtr == NULL) {
ret = readlink(TZZONELINK, gTimeZoneBuffer, sizeof(gTimeZoneBuffer));
if (0 < ret) {
gTimeZoneBuffer[ret] = 0;
if (uprv_strncmp(gTimeZoneBuffer, TZZONEINFO, sizeof(TZZONEINFO) - 1) == 0) {
return (gTimeZoneBufferPtr = gTimeZoneBuffer + sizeof(TZZONEINFO) - 1);
}
}
}
#endif
#if 0
/* TZ is often set to "PST8PDT" or similar, so we cannot use it. Alan */
tzenv = getenv("TZ");
@ -1244,23 +1254,6 @@ uprv_tzname(int n)
}
#endif
/* Caller must handle threading issues */
if (gTimeZoneBuffer == NULL) {
gTimeZoneBuffer = (char *) uprv_malloc(MAXPATHLEN + 2);
ret = readlink(TZZONELINK, gTimeZoneBuffer, MAXPATHLEN + 2);
if (0 < ret) {
gTimeZoneBuffer[ret] = '\0';
if (uprv_strncmp(gTimeZoneBuffer, TZZONEINFO, sizeof(TZZONEINFO) - 1) == 0) {
return (gTimeZoneBuffer += sizeof(TZZONEINFO) - 1);
}
}
uprv_free(gTimeZoneBuffer);
gTimeZoneBuffer = NULL;
}
#endif
#ifdef U_TZNAME
return U_TZNAME[n];
#else