bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 11/27] quotearg: improve -fanalyzer malloc checking


From: Paul Eggert
Subject: [PATCH 11/27] quotearg: improve -fanalyzer malloc checking
Date: Sun, 1 Aug 2021 18:18:05 -0700

---
 ChangeLog      | 2 +-
 lib/quotearg.h | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3573cee2..8a3dcb388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@
        * lib/backup-internal.h, lib/backupfile.h:
        * 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/mountlist.h, lib/pagealign_alloc.h, lib/quotearg.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/quotearg.h b/lib/quotearg.h
index ecef74f74..22c09bcea 100644
--- a/lib/quotearg.h
+++ b/lib/quotearg.h
@@ -333,7 +333,9 @@ size_t quotearg_buffer (char *restrict buffer, size_t 
buffersize,
    buffer.  It is the caller's responsibility to free the result.  The
    result will not contain embedded null bytes.  */
 char *quotearg_alloc (char const *arg, size_t argsize,
-                      struct quoting_options const *o);
+                      struct quoting_options const *o)
+  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+  _GL_ATTRIBUTE_RETURNS_NONNULL;
 
 /* Like quotearg_alloc, except that the length of the result,
    excluding the terminating null byte, is stored into SIZE if it is
@@ -342,7 +344,10 @@ char *quotearg_alloc (char const *arg, size_t argsize,
    backslash escapes, and the flags of O do not request elision of
    null bytes.*/
 char *quotearg_alloc_mem (char const *arg, size_t argsize,
-                          size_t *size, struct quoting_options const *o);
+                          size_t *size, struct quoting_options const *o)
+  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+  _GL_ATTRIBUTE_RETURNS_NONNULL;
+;
 
 /* Use storage slot N to return a quoted version of the string ARG.
    Use the default quoting options.
-- 
2.31.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]