From 942d35f72bea5a0d19a5d0e0a5ca533e37a88b2c Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Thu, 6 Jun 2019 14:10:08 +0100 Subject: [PATCH] libctf: avoid strndup 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 . * ctf-lookup.c (ctf_lookup_by_name): Call xstrndup(), not strndup(). --- libctf/ChangeLog | 5 +++++ libctf/ctf-decls.h | 1 + libctf/ctf-lookup.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libctf/ChangeLog b/libctf/ChangeLog index 20f9816efd..f48ad5b213 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,3 +1,8 @@ +2019-06-06 Nick Alcock + + * ctf-decls.h: Include . + * ctf-lookup.c (ctf_lookup_by_name): Call xstrndup(), not strndup(). + 2019-06-06 Nick Alcock * ctf-dump.c (ctf_dump_format_type): Cast size_t's used in printf()s. 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 #include +#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.34.1