From patchwork Thu Feb 26 06:12:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 5302 Received: (qmail 119557 invoked by alias); 26 Feb 2015 06:12:32 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 119539 invoked by uid 89); 26 Feb 2015 06:12:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD, UNSUBSCRIBE_BODY autolearn=no version=3.3.2 X-HELO: mx1.redhat.com From: Alexandre Oliva To: "Carlos O'Donell" Cc: Roland McGrath , libc-alpha@sourceware.org Subject: Re: search locale archive again after alias expansion References: <20130918220004.B23492C09F@topped-with-meat.com> <54E796D1.40502@redhat.com> Date: Thu, 26 Feb 2015 03:12:16 -0300 In-Reply-To: <54E796D1.40502@redhat.com> (Carlos O'Donell's message of "Fri, 20 Feb 2015 15:19:29 -0500") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Here's a follow-up patch that gets us rid of all the const-casting in loc_name and *name. This ensures we won't write to stuff that should be const by accident, and avoids unsafely dereferencing pointers to pointers. Ok to install? for ChangeLog [BZ #15969] * locale/findlocale.c (_nl_find_locale): Introduce const version of loc_name and drop unsafe type casts. --- locale/findlocale.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/locale/findlocale.c b/locale/findlocale.c index 5e2639b..9e7df12 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -105,7 +105,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, { int mask; /* Name of the locale for this category. */ - char *loc_name = (char *) *name; + const char *cloc_name = *name; const char *language; const char *modifier; const char *territory; @@ -113,39 +113,39 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, const char *normalized_codeset; struct loaded_l10nfile *locale_file; - if (loc_name[0] == '\0') + if (cloc_name[0] == '\0') { /* The user decides which locale to use by setting environment variables. */ - loc_name = getenv ("LC_ALL"); - if (!name_present (loc_name)) - loc_name = getenv (_nl_category_names.str - + _nl_category_name_idxs[category]); - if (!name_present (loc_name)) - loc_name = getenv ("LANG"); - if (!name_present (loc_name)) - loc_name = (char *) _nl_C_name; + cloc_name = getenv ("LC_ALL"); + if (!name_present (cloc_name)) + cloc_name = getenv (_nl_category_names.str + + _nl_category_name_idxs[category]); + if (!name_present (cloc_name)) + cloc_name = getenv ("LANG"); + if (!name_present (cloc_name)) + cloc_name = _nl_C_name; } /* We used to fall back to the C locale if the name contains a slash character '/', but we now check for directory traversal in valid_locale_name, so this is no longer necessary. */ - if (__builtin_expect (strcmp (loc_name, _nl_C_name), 1) == 0 - || __builtin_expect (strcmp (loc_name, _nl_POSIX_name), 1) == 0) + if (__builtin_expect (strcmp (cloc_name, _nl_C_name), 1) == 0 + || __builtin_expect (strcmp (cloc_name, _nl_POSIX_name), 1) == 0) { /* We need not load anything. The needed data is contained in the library itself. */ - *name = (char *) _nl_C_name; + *name = _nl_C_name; return _nl_C[category]; } - else if (!valid_locale_name (loc_name)) + else if (!valid_locale_name (cloc_name)) { __set_errno (EINVAL); return NULL; } - *name = loc_name; + *name = cloc_name; /* We really have to load some data. First we try the archive, but only if there was no LOCPATH environment variable specified. */ @@ -158,11 +158,10 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, /* Nothing in the archive with the given name. Expanding it as an alias and retry. */ - loc_name = (char *) _nl_expand_alias (*name); - if (loc_name != NULL) + cloc_name = _nl_expand_alias (*name); + if (cloc_name != NULL) { - data = _nl_load_locale_from_archive (category, - (const char **) &loc_name); + data = _nl_load_locale_from_archive (category, &cloc_name); if (__builtin_expect (data != NULL, 1)) return data; } @@ -175,14 +174,14 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, /* We really have to load some data. First see whether the name is an alias. Please note that this makes it impossible to have "C" or "POSIX" as aliases. */ - loc_name = (char *) _nl_expand_alias (*name); + cloc_name = _nl_expand_alias (*name); - if (loc_name == NULL) + if (cloc_name == NULL) /* It is no alias. */ - loc_name = (char *) *name; + cloc_name = *name; /* Make a writable copy of the locale name. */ - loc_name = strdupa (loc_name); + char *loc_name = strdupa (cloc_name); /* LOCALE can consist of up to four recognized parts for the XPG syntax: