From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS22989 209.51.188.0/24 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id D23681F8C6 for ; Mon, 2 Aug 2021 01:19:43 +0000 (UTC) Received: from localhost ([::1]:47358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAMcI-0000QX-Rd for normalperson@yhbt.net; Sun, 01 Aug 2021 21:19:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAMbq-0007II-7J for bug-gnulib@gnu.org; Sun, 01 Aug 2021 21:19:14 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:34344) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAMbm-00011f-TK for bug-gnulib@gnu.org; Sun, 01 Aug 2021 21:19:13 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 964AF160113 for ; Sun, 1 Aug 2021 18:19:09 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 9x1dcEN5K7x4; Sun, 1 Aug 2021 18:19:08 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id C2AEC160107; Sun, 1 Aug 2021 18:19:08 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Yv-HMwdqmZQL; Sun, 1 Aug 2021 18:19:08 -0700 (PDT) Received: from penguin.cs.ucla.edu (Penguin.CS.UCLA.EDU [131.179.64.200]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 9D268160100; Sun, 1 Aug 2021 18:19:08 -0700 (PDT) From: Paul Eggert To: bug-gnulib@gnu.org Subject: [PATCH 14/27] sh-quote: improve -fanalyzer malloc checking Date: Sun, 1 Aug 2021 18:18:08 -0700 Message-Id: <20210802011821.1057057-14-eggert@cs.ucla.edu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210802011821.1057057-1-eggert@cs.ucla.edu> References: <20210802011821.1057057-1-eggert@cs.ucla.edu> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=131.179.128.68; envelope-from=eggert@cs.ucla.edu; helo=zimbra.cs.ucla.edu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: bug-gnulib@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Gnulib discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Eggert Errors-To: bug-gnulib-bounces+normalperson=yhbt.net@gnu.org Sender: "bug-gnulib" --- ChangeLog | 2 +- lib/sh-quote.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45fd8cad5..6c81691fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ * lib/canonicalize.h, lib/dfa.h, lib/dirname.h, lib/exclude.h: * lib/filenamecat.h, lib/malloca.h, lib/modechange.h: * lib/mountlist.h, lib/pagealign_alloc.h, lib/quotearg.h: - * lib/readutmp.h, lib/savedir.h: + * lib/readutmp.h, lib/savedir.h, lib/sh-quote.h: Add malloc-related attributes and include stdlib.h as needed. * lib/dfa.c: Include verify.h. (assume_nonnull): New macro. diff --git a/lib/sh-quote.h b/lib/sh-quote.h index e543e4063..0101036e5 100644 --- a/lib/sh-quote.h +++ b/lib/sh-quote.h @@ -23,6 +23,7 @@ "$", '*', '?' etc. in a special way. */ =20 #include +#include =20 #ifdef __cplusplus extern "C" { @@ -36,11 +37,15 @@ extern size_t shell_quote_length (const char *string)= ; extern char * shell_quote_copy (char *restrict p, const char *string); =20 /* Returns the freshly allocated quoted string. */ -extern char * shell_quote (const char *string); +extern char * shell_quote (const char *string) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE + _GL_ATTRIBUTE_RETURNS_NONNULL; =20 /* Returns a freshly allocated string containing all argument strings, q= uoted, separated through spaces. */ -extern char * shell_quote_argv (const char * const *argv); +extern char * shell_quote_argv (const char * const *argv) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE + _GL_ATTRIBUTE_RETURNS_NONNULL; =20 #ifdef __cplusplus } --=20 2.31.1