This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 3/3] libctf: avoid strndup
- From: Nick Alcock <nick dot alcock at oracle dot com>
- To: binutils at sourceware dot org
- Cc: jose dot marchesi at oracle dot com, tom dot tromey at adacore dot com
- Date: Thu, 6 Jun 2019 21:22:32 +0100
- Subject: [PATCH 3/3] libctf: avoid strndup
- References: <20190606202232.711-1-nick.alcock@oracle.com>
Not all platforms have it. Use libiberty xstrndup() instead.
(The include of libiberty.h happens in an unusual place due to the
requirements of synchronization of most source files between this
project and another that does not use libiberty. It serves to pull
libiberty.h in for all source files in libctf/, which does the trick.)
Tested on x86_64-pc-linux-gnu, x86_64-unknown-freebsd12.0,
sparc-sun-solaris2.11, i686-pc-cygwin, i686-w64-mingw32.
libctf/
* ctf-decls.h: Include <libiberty.h>.
* ctf-lookup.c (ctf_lookup_by_name): Call xstrndup(), not strndup().
---
libctf/ctf-decls.h | 1 +
libctf/ctf-lookup.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/libctf/ctf-decls.h b/libctf/ctf-decls.h
index c840b793c9..b60a48f987 100644
--- a/libctf/ctf-decls.h
+++ b/libctf/ctf-decls.h
@@ -24,6 +24,7 @@
#include <stddef.h>
#include <stdlib.h>
+#include "libiberty.h"
#if HAVE_QSORT_R_ARG_LAST
static inline void
diff --git a/libctf/ctf-lookup.c b/libctf/ctf-lookup.c
index ab12715f4b..4089ad9ffa 100644
--- a/libctf/ctf-lookup.c
+++ b/libctf/ctf-lookup.c
@@ -153,7 +153,7 @@ ctf_lookup_by_name (ctf_file_t *fp, const char *name)
else
{
free (fp->ctf_tmp_typeslice);
- fp->ctf_tmp_typeslice = strndup (p, (size_t) (q - p));
+ fp->ctf_tmp_typeslice = xstrndup (p, (size_t) (q - p));
if (fp->ctf_tmp_typeslice == NULL)
{
(void) ctf_set_errno (fp, ENOMEM);
--
2.21.0.237.gd0cfaa883d