From c902e7c9a72c4df40b3b3a85f26bf19eddea6c43 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 Aug 2021 17:43:35 -0700 Subject: [PATCH] system-quote: improve -fanalyzer malloc checking --- ChangeLog | 2 +- lib/system-quote.h | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c81691fba..7ef3676a6d 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/sh-quote.h: + * lib/readutmp.h, lib/savedir.h, lib/sh-quote.h, lib/system-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/system-quote.h b/lib/system-quote.h index f378950e91..b1bbf65216 100644 --- a/lib/system-quote.h +++ b/lib/system-quote.h @@ -47,6 +47,7 @@ */ #include +#include #ifdef __cplusplus extern "C" { @@ -84,13 +85,17 @@ extern char * /* Returns the freshly allocated quoted string. */ extern char * system_quote (enum system_command_interpreter interpreter, - const char *string); + const char *string) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE + _GL_ATTRIBUTE_RETURNS_NONNULL; /* Returns a freshly allocated string containing all argument strings, quoted, separated through spaces. */ extern char * system_quote_argv (enum system_command_interpreter interpreter, - char * const *argv); + char * const *argv) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE + _GL_ATTRIBUTE_RETURNS_NONNULL; #ifdef __cplusplus } -- 2.39.5