From patchwork Mon Jun 19 16:17:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 21095 Received: (qmail 58335 invoked by alias); 19 Jun 2017 16:17:04 -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 58082 invoked by uid 89); 19 Jun 2017 16:17:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A9B8C80C15 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=fweimer@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A9B8C80C15 Date: Mon, 19 Jun 2017 18:17:03 +0200 To: libc-alpha@sourceware.org Subject: [PATCH] gconv: Replace norm_add_slashes with __gconv_norm_add_slashes User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20170619161703.C2225402AEC3C@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2017-06-19 Florian Weimer * iconv/Makefile (routine): Add norm_add_slashes. * iconv/norm_add_slashes.c: New file, extracted from iconv/gconv_int.h. * iconv/gconv_int.h (norm_add_slashes): Remove. (__gconv_norm_add_slashes): Declare. * wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Use __gconv_norm_add_slashes. * intl/dcigettext.c (_nl_find_msg): Likewise. Simplify !_LIBC case. diff --git a/iconv/Makefile b/iconv/Makefile index b2fead0..df82b0d 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -25,7 +25,8 @@ include ../Makeconfig headers = iconv.h gconv.h routines = iconv_open iconv iconv_close \ gconv_open gconv gconv_close gconv_db gconv_conf \ - gconv_builtin gconv_simple gconv_trans gconv_cache + gconv_builtin gconv_simple gconv_trans gconv_cache \ + norm_add_slashes routines += gconv_dl vpath %.c ../locale/programs ../intl diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h index 85a67ad..7a54e0f 100644 --- a/iconv/gconv_int.h +++ b/iconv/gconv_int.h @@ -121,38 +121,13 @@ extern const char *__gconv_path_envvar attribute_hidden; __libc_lock_define (extern, __gconv_lock attribute_hidden) -/* The gconv functions expects the name to be in upper case and complete, - including the trailing slashes if necessary. */ -#define norm_add_slashes(str,suffix) \ - ({ \ - const char *cp = (str); \ - char *result; \ - char *tmp; \ - size_t cnt = 0; \ - const size_t suffix_len = strlen (suffix); \ - \ - while (*cp != '\0') \ - if (*cp++ == '/') \ - ++cnt; \ - \ - tmp = result = __alloca (cp - (str) + 3 + suffix_len); \ - cp = (str); \ - while (*cp != '\0') \ - *tmp++ = __toupper_l (*cp++, _nl_C_locobj_ptr); \ - if (cnt < 2) \ - { \ - *tmp++ = '/'; \ - if (cnt < 1) \ - { \ - *tmp++ = '/'; \ - if (suffix_len != 0) \ - tmp = __mempcpy (tmp, suffix, suffix_len); \ - } \ - } \ - *tmp = '\0'; \ - result; \ - }) - +/* Convert NAME of NAME_LEN bytes to the form expected by the gconv + functions, including the trailing slashes if necessary. The caller + has to free the returned string. Return NULL on allocation + failure. */ +char *__gconv_norm_add_slashes (const char *name, size_t name_len, + const char *suffix) + attribute_hidden; /* Return in *HANDLE decriptor for transformation from FROMSET to TOSET. */ extern int __gconv_open (const char *toset, const char *fromset, diff --git a/iconv/norm_add_slashes.c b/iconv/norm_add_slashes.c new file mode 100644 index 0000000..f380524 --- /dev/null +++ b/iconv/norm_add_slashes.c @@ -0,0 +1,54 @@ +/* Normalize the charset name and add a suffix with slashes. + Copyright (C) 1997-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include + +char * +__gconv_norm_add_slashes (const char *name, size_t name_len, + const char *suffix) +{ + const char *name_end = name + name_len; + const char *cp = name; + char *result; + char *tmp; + size_t cnt = 0; + const size_t suffix_len = strlen (suffix); + + while (cp != name_end) + if (*cp++ == '/') + ++cnt; + + tmp = result = malloc (name_len + 3 + suffix_len); + if (result == NULL) + return NULL; + cp = name; + while (cp != name_end) + *tmp++ = __toupper_l (*cp++, _nl_C_locobj_ptr); + if (cnt < 2) + { + *tmp++ = '/'; + if (cnt < 1) + { + *tmp++ = '/'; + if (suffix_len != 0) + tmp = __mempcpy (tmp, suffix, suffix_len); + } + } + *tmp = '\0'; + return result; +} diff --git a/intl/dcigettext.c b/intl/dcigettext.c index d97746c..49127d0 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -1123,25 +1123,24 @@ _nl_find_msg (struct loaded_l10nfile *domain_file, { size_t len; char *charset; - const char *outcharset; + char *outcharset; charsetstr += strlen ("charset="); len = strcspn (charsetstr, " \t\n"); - charset = (char *) alloca (len + 1); -# if defined _LIBC || HAVE_MEMPCPY - *((char *) mempcpy (charset, charsetstr, len)) = '\0'; -# else - memcpy (charset, charsetstr, len); - charset[len] = '\0'; -# endif - - outcharset = encoding; - # ifdef _LIBC /* We always want to use transliteration. */ - outcharset = norm_add_slashes (outcharset, "TRANSLIT"); - charset = norm_add_slashes (charset, ""); + charset = __gconv_norm_add_slashes (charsetstr, len, ""); + outcharset = __gconv_norm_add_slashes + (encoding, strlen (encoding), "TRANSLIT"); + if (charset == NULL || outcharset == NULL) + { + free ((char *) encoding); + free (outcharset); + free (charset); + goto unlock_fail; + } + int r = __gconv_open (outcharset, charset, &convd->conv, GCONV_AVOID_NOCONV); if (__builtin_expect (r != __GCONV_OK, 0)) @@ -1153,6 +1152,8 @@ _nl_find_msg (struct loaded_l10nfile *domain_file, { gl_rwlock_unlock (domain->conversions_lock); free ((char *) encoding); + free (outcharset); + free (charset); return NULL; } @@ -1165,27 +1166,31 @@ _nl_find_msg (struct loaded_l10nfile *domain_file, # if (((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2) \ && !defined __UCLIBC__) \ || _LIBICONV_VERSION >= 0x0105 + charset = strndup (charsetstr, len); if (strchr (outcharset, '/') == NULL) { - char *tmp; - - len = strlen (outcharset); - tmp = (char *) alloca (len + 10 + 1); - memcpy (tmp, outcharset, len); - memcpy (tmp + len, "//TRANSLIT", 10 + 1); - outcharset = tmp; - - convd->conv = iconv_open (outcharset, charset); - - freea (outcharset); + if (asprintf (&outcharset, "%s//TRANSLIT", + encoding) < 0) + outcharset = NULL; } else + outcharset = strdup (encoding); + if (charset == NULL || outcharset == NULL) + { + gl_rwlock_unlock (domain->conversions_lock); + free (outcharset); + free (charset); + free ((char *) encoding); + return NULL; + } # endif - convd->conv = iconv_open (outcharset, charset); + convd->conv = iconv_open (outcharset, charset); # endif # endif - - freea (charset); + free (outcharset); + free (charset); + /* Do not free encoding here because + convd->encoding takes ownership. */ } } } diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index 656cc0a..cf7f815 100644 --- a/wcsmbs/wcsmbsload.c +++ b/wcsmbs/wcsmbsload.c @@ -160,7 +160,6 @@ __wcsmbs_load_conv (struct __locale_data *new_category) { /* We must find the real functions. */ const char *charset_name; - const char *complete_name; struct gconv_fcts *new_fcts; int use_translit; @@ -177,8 +176,11 @@ __wcsmbs_load_conv (struct __locale_data *new_category) /* Normalize the name and add the slashes necessary for a complete lookup. */ - complete_name = norm_add_slashes (charset_name, - use_translit ? "TRANSLIT" : ""); + char *complete_name = __gconv_norm_add_slashes + (charset_name, strlen (charset_name), + use_translit ? "TRANSLIT" : ""); + if (complete_name ==NULL) + goto failed; /* It is not necessary to use transliteration in this direction since the internal character set is supposed to be able to @@ -188,6 +190,7 @@ __wcsmbs_load_conv (struct __locale_data *new_category) if (new_fcts->towc != NULL) new_fcts->tomb = __wcsmbs_getfct (complete_name, "INTERNAL", &new_fcts->tomb_nsteps); + free (complete_name); /* If any of the conversion functions is not available we don't use any since this would mean we cannot convert back and