diff mbox series

[4/8] locale/programs/locarchive.c: fix warn unused result

Message ID	20230418121130.844302-5-fberat@redhat.com
State	Superseded
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 508D23857706 To: libc-alpha@sourceware.org Cc: sipoyare@redhat.com Subject: [PATCH 4/8] locale/programs/locarchive.c: fix warn unused result Date: Tue, 18 Apr 2023 14:11:26 +0200 Message-Id: <20230418121130.844302-5-fberat@redhat.com> In-Reply-To: <20230418121130.844302-1-fberat@redhat.com> References: <20230418121130.844302-1-fberat@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Precedence: list From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_B=C3=A9rat_via_Libc-alpha?= <libc-alpha@sourceware.org> Reply-To: =?utf-8?b?RnLDqWTDqXJpYyBCw6lyYXQ=?= <fberat@redhat.com> Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org>
Series	Fix warn unused result \| [0/8] Fix warn unused result [1/8] tests: fix warn unused result [2/8] catgets/gencat.c: fix warn unused result [3/8] inet/rcmd.c: fix warn unused result [4/8] locale/programs/locarchive.c: fix warn unused result [5/8] malloc/{memusage.c, memusagestat.c}: fix warn unused result [6/8] nptl_db/thread_dbP.h: fix warn unused result [7/8] sunrpc/netname.c: fix warn unused result [8/8] sysdeps/pthread/eintr.c: fix warn unused result

Checks

Context	Check	Description
dj/TryBot-apply_patch	success	Patch applied to master at the time it was sent

Commit Message

Frederic Berat April 18, 2023, 12:11 p.m. UTC

  Fix unused result warnings, detected when _FORTIFY_SOURCE is enabled in
glibc.
---
 locale/programs/locarchive.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Comments

Siddhesh Poyarekar April 18, 2023, 12:43 p.m. UTC | #1

On 2023-04-18 08:11, Frédéric Bérat via Libc-alpha wrote:
> Fix unused result warnings, detected when _FORTIFY_SOURCE is enabled in
> glibc.
> ---
>   locale/programs/locarchive.c | 18 ++++++++++--------
>   1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
> index 87d2d9b1b2..4e13bb9ce9 100644
> --- a/locale/programs/locarchive.c
> +++ b/locale/programs/locarchive.c
> @@ -1154,10 +1154,11 @@ add_locale_to_archive (struct locarhandle *ah, const char *name,
>     if (mask & XPG_NORM_CODESET)
>       /* This name contains a codeset in unnormalized form.
>          We will store it in the archive with a normalized name.  */
> -    asprintf (&normalized_name, "%s%s%s.%s%s%s",
> -	      language, territory == NULL ? "" : "_", territory ?: "",
> -	      (mask & XPG_NORM_CODESET) ? normalized_codeset : codeset,
> -	      modifier == NULL ? "" : "@", modifier ?: "");
> +    if (asprintf (&normalized_name, "%s%s%s.%s%s%s",
> +		  language, territory == NULL ? "" : "_", territory ?: "",
> +		  (mask & XPG_NORM_CODESET) ? normalized_codeset : codeset,
> +		  modifier == NULL ? "" : "@", modifier ?: "") < 0)
> +	    return -1;

Wouldn't this leak normalized_codeset?

Also, this is within if (mask & XPG_NORM_CODESET), so the:

(mask & XPG_NORM_CODESET) ? normalized_codeset : codeset

looks unnecessary, doesn't it?  I know that's how the original code is, 
but maybe it's worth cleaning up while you're there.  In a separate 
patch though please.

>   
>     /* This call does the main work.  */
>     locrec_offset = add_locale (ah, normalized_name ?: name, data, replace);
> @@ -1188,10 +1189,11 @@ add_locale_to_archive (struct locarhandle *ah, const char *name,
>         normalized_codeset = _nl_normalize_codeset (codeset, strlen (codeset));
>         mask |= XPG_NORM_CODESET;
>   
> -      asprintf (&normalized_codeset_name, "%s%s%s.%s%s%s",
> -		language, territory == NULL ? "" : "_", territory ?: "",
> -		normalized_codeset,
> -		modifier == NULL ? "" : "@", modifier ?: "");
> +      if (asprintf (&normalized_codeset_name, "%s%s%s.%s%s%s",
> +		    language, territory == NULL ? "" : "_", territory ?: "",
> +		    normalized_codeset,
> +		    modifier == NULL ? "" : "@", modifier ?: "") < 0)
> +	      return -1;

Likewise.

>   
>         add_alias (ah, normalized_codeset_name, replace,
>   		 normalized_name ?: name, &locrec_offset);

diff mbox series

Patch

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 87d2d9b1b2..4e13bb9ce9 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -1154,10 +1154,11 @@  add_locale_to_archive (struct locarhandle *ah, const char *name,
   if (mask & XPG_NORM_CODESET)
     /* This name contains a codeset in unnormalized form.
        We will store it in the archive with a normalized name.  */
-    asprintf (&normalized_name, "%s%s%s.%s%s%s",
-	      language, territory == NULL ? "" : "_", territory ?: "",
-	      (mask & XPG_NORM_CODESET) ? normalized_codeset : codeset,
-	      modifier == NULL ? "" : "@", modifier ?: "");
+    if (asprintf (&normalized_name, "%s%s%s.%s%s%s",
+		  language, territory == NULL ? "" : "_", territory ?: "",
+		  (mask & XPG_NORM_CODESET) ? normalized_codeset : codeset,
+		  modifier == NULL ? "" : "@", modifier ?: "") < 0)
+	    return -1;
 
   /* This call does the main work.  */
   locrec_offset = add_locale (ah, normalized_name ?: name, data, replace);
@@ -1188,10 +1189,11 @@  add_locale_to_archive (struct locarhandle *ah, const char *name,
       normalized_codeset = _nl_normalize_codeset (codeset, strlen (codeset));
       mask |= XPG_NORM_CODESET;
 
-      asprintf (&normalized_codeset_name, "%s%s%s.%s%s%s",
-		language, territory == NULL ? "" : "_", territory ?: "",
-		normalized_codeset,
-		modifier == NULL ? "" : "@", modifier ?: "");
+      if (asprintf (&normalized_codeset_name, "%s%s%s.%s%s%s",
+		    language, territory == NULL ? "" : "_", territory ?: "",
+		    normalized_codeset,
+		    modifier == NULL ? "" : "@", modifier ?: "") < 0)
+	      return -1;
 
       add_alias (ah, normalized_codeset_name, replace,
 		 normalized_name ?: name, &locrec_offset);