From 91448cc91e7f7cf8b4bb6d28f8d14f8f1ead95fd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 Aug 2021 17:47:24 -0700 Subject: [PATCH] xstriconv: improve -fanalyzer malloc checking --- ChangeLog | 2 +- lib/xstriconv.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19ca548c7c..aba2b150d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ * lib/mountlist.h, lib/pagealign_alloc.h, lib/quotearg.h: * lib/readutmp.h, lib/savedir.h, lib/sh-quote.h, lib/system-quote.h: * lib/trim.h, lib/xgetcwd.h, lib/xgethostname.h, lib/xmalloca.h: - * lib/xreadlink.h: + * lib/xreadlink.h, lib/xstriconv.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/xstriconv.h b/lib/xstriconv.h index 1f69fa3b22..d90aa4c5cf 100644 --- a/lib/xstriconv.h +++ b/lib/xstriconv.h @@ -19,6 +19,7 @@ #define _XSTRICONV_H #include +#include #if HAVE_ICONV #include #endif @@ -54,7 +55,8 @@ extern int xmem_cd_iconv (const char *src, size_t srclen, iconv_t cd, Upon memory allocation failure, report the error and exit. Return value: the freshly allocated resulting NUL-terminated string if successful, otherwise NULL and errno set. */ -extern char * xstr_cd_iconv (const char *src, iconv_t cd); +extern char * xstr_cd_iconv (const char *src, iconv_t cd) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; #endif @@ -67,8 +69,8 @@ extern char * xstr_cd_iconv (const char *src, iconv_t cd); Return value: the freshly allocated resulting NUL-terminated string if successful, otherwise NULL and errno set. */ extern char * xstr_iconv (const char *src, - const char *from_codeset, const char *to_codeset); - + const char *from_codeset, const char *to_codeset) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; #ifdef __cplusplus } -- 2.39.5