diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 2003-06-13 00:14:07 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 2003-06-13 00:14:07 +0000 |
commit | 3dfdc427f16da8bb6c3374ca0140eadd5f8ab867 (patch) | |
tree | 8a933dd924bf8f358332d7cf52977b4a04422fc4 /lib/libc/locale | |
parent | 887cae2b7095459b532798a0e8e4980b7ea29065 (diff) | |
download | src-3dfdc427f16da8bb6c3374ca0140eadd5f8ab867.tar.gz src-3dfdc427f16da8bb6c3374ca0140eadd5f8ab867.zip |
Fixes to locale code to properly use indirect pointers in order to prevent
memory leaks (fixes bugs earlier purported to be fixed).
Submitted by: Ed Moy <emoy@apple.com>
Obtained from: Apple Computer, Inc.
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=116274
Diffstat (limited to 'lib/libc/locale')
-rw-r--r-- | lib/libc/locale/ldpart.c | 12 | ||||
-rw-r--r-- | lib/libc/locale/ldpart.h | 2 | ||||
-rw-r--r-- | lib/libc/locale/lmessages.c | 2 | ||||
-rw-r--r-- | lib/libc/locale/lmonetary.c | 2 | ||||
-rw-r--r-- | lib/libc/locale/lnumeric.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c index ceb83949d3c4..62f92fdeee96 100644 --- a/lib/libc/locale/ldpart.c +++ b/lib/libc/locale/ldpart.c @@ -47,7 +47,7 @@ static int split_lines(char *, const char *); int __part_load_locale(const char *name, int *using_locale, - char *locale_buf, + char **locale_buf, const char *category_filename, int locale_buf_size_max, int locale_buf_size_min, @@ -69,7 +69,7 @@ __part_load_locale(const char *name, /* * If the locale name is the same as our cache, use the cache. */ - if (locale_buf != NULL && strcmp(name, locale_buf) == 0) { + if (*locale_buf != NULL && strcmp(name, *locale_buf) == 0) { *using_locale = 1; return (_LDP_CACHE); } @@ -124,10 +124,10 @@ __part_load_locale(const char *name, /* * Record the successful parse in the cache. */ - if (locale_buf != NULL) - free(locale_buf); - locale_buf = lbuf; - for (p = locale_buf, i = 0; i < num_lines; i++) + if (*locale_buf != NULL) + free(*locale_buf); + *locale_buf = lbuf; + for (p = *locale_buf, i = 0; i < num_lines; i++) dst_localebuf[i] = (p += strlen(p) + 1); for (i = num_lines; i < locale_buf_size_max; i++) dst_localebuf[i] = NULL; diff --git a/lib/libc/locale/ldpart.h b/lib/libc/locale/ldpart.h index becca06b1c0d..45f7339fe8fb 100644 --- a/lib/libc/locale/ldpart.h +++ b/lib/libc/locale/ldpart.h @@ -33,7 +33,7 @@ #define _LDP_ERROR (-1) #define _LDP_CACHE 1 -int __part_load_locale(const char *, int*, char *, const char *, +int __part_load_locale(const char *, int*, char **, const char *, int, int, const char **); #endif /* !_LDPART_H_ */ diff --git a/lib/libc/locale/lmessages.c b/lib/libc/locale/lmessages.c index ed58c99ada64..06e56cdad33e 100644 --- a/lib/libc/locale/lmessages.c +++ b/lib/libc/locale/lmessages.c @@ -55,7 +55,7 @@ __messages_load_locale(const char *name) int ret; ret = __part_load_locale(name, &_messages_using_locale, - _messages_locale_buf, "LC_MESSAGES", + &_messages_locale_buf, "LC_MESSAGES", LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN, (const char **)&_messages_locale); if (ret == _LDP_LOADED) { diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c index 1e35bf00fd12..facda8d7bbeb 100644 --- a/lib/libc/locale/lmonetary.c +++ b/lib/libc/locale/lmonetary.c @@ -88,7 +88,7 @@ __monetary_load_locale(const char *name) int ret; ret = __part_load_locale(name, &_monetary_using_locale, - _monetary_locale_buf, "LC_MONETARY", + &_monetary_locale_buf, "LC_MONETARY", LCMONETARY_SIZE_FULL, LCMONETARY_SIZE_MIN, (const char **)&_monetary_locale); if (ret != _LDP_ERROR) diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c index 77d2bfa1fc72..93accccb5811 100644 --- a/lib/libc/locale/lnumeric.c +++ b/lib/libc/locale/lnumeric.c @@ -54,7 +54,7 @@ __numeric_load_locale(const char *name) int ret; ret = __part_load_locale(name, &_numeric_using_locale, - _numeric_locale_buf, "LC_NUMERIC", + &_numeric_locale_buf, "LC_NUMERIC", LCNUMERIC_SIZE, LCNUMERIC_SIZE, (const char **)&_numeric_locale); if (ret != _LDP_ERROR) |