mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

xmalloc: Fix warnings with gcc analyzer

Browse Source 
Tell the compiler that xmalloc family of allocators always return
non-NULL.  xrealloc in locale/programs also always returns non-NULL,
but that conflicts with default realloc behaviour and that of xrealloc
in libsupport, so keep it as is for now and resolve the differences
later.

Reviewed-by: Florian Weimer <fweimer@redhat.com>
This commit is contained in:
Siddhesh Poyarekar 2021-07-28 16:58:17 +05:30
parent 4aedc25f55
commit b8e8bb324a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/programs/xmalloc.h
View File

@ -23,11 +23,14 @@
/* Prototypes for a few program-wide used functions. */
extern void *xmalloc (size_t n)
__attribute_malloc__ __attribute_alloc_size__ ((1)) __attr_dealloc_free;
__attribute_malloc__ __attribute_alloc_size__ ((1)) __attr_dealloc_free
__returns_nonnull;
extern void *xcalloc (size_t n, size_t s)
__attribute_malloc__ __attribute_alloc_size__ ((1, 2)) __attr_dealloc_free;
__attribute_malloc__ __attribute_alloc_size__ ((1, 2)) __attr_dealloc_free
__returns_nonnull;
extern void *xrealloc (void *o, size_t n)
__attribute_malloc__ __attribute_alloc_size__ ((2)) __attr_dealloc_free;
extern char *xstrdup (const char *) __attribute_malloc__ __attr_dealloc_free;
extern char *xstrdup (const char *) __attribute_malloc__ __attr_dealloc_free
__returns_nonnull;
#endif /* xmalloc.h */

10
misc/sys/cdefs.h
View File

@ -330,6 +330,16 @@
# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
#endif
/* The returns_nonnull function attribute marks the return type of the function
as always being non-null. */
#ifndef __returns_nonnull
# if __GNUC_PREREQ (4, 9) || __glibc_has_attribute (__returns_nonnull__)
# define __returns_nonnull __attribute__ ((__returns_nonnull__))
# else
# define __returns_nonnull
# endif
#endif
/* If fortification mode, we warn about unused results of certain
function calls which can lead to problems. */
#if __GNUC_PREREQ (3,4) || __glibc_has_attribute (__warn_unused_result__)