From b279b399553d273317a7faa59c3ebbfba0c353cd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 Aug 2021 17:31:38 -0700 Subject: [PATCH] filenamecat-lgpl: improve -fanalyzer malloc checking --- ChangeLog | 1 + lib/filenamecat.h | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bac4c5fcc0..6bad8ceb67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ maint: improve -fanalyzer malloc checking * lib/backup-internal.h, lib/backupfile.h: * lib/canonicalize.h, lib/dfa.h, lib/dirname.h, lib/exclude.h: + * lib/filenamecat.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/filenamecat.h b/lib/filenamecat.h index e2ff466597..e5acb1588d 100644 --- a/lib/filenamecat.h +++ b/lib/filenamecat.h @@ -18,10 +18,15 @@ /* Written by Jim Meyering. */ +#include + #if GNULIB_FILENAMECAT char *file_name_concat (char const *dir, char const *base, - char **base_in_result); + char **base_in_result) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE + _GL_ATTRIBUTE_RETURNS_NONNULL; #endif char *mfile_name_concat (char const *dir, char const *base, - char **base_in_result); + char **base_in_result) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; -- 2.39.5