From 96e3ec29664810995d6d7d3b6fd6ae2d19c532bd Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Tue, 2 Jun 2020 20:49:14 +0100 Subject: [PATCH] libctf, types: ints, floats and typedefs with no name are invalid Report them as such, rather than letting ctf_decl_sprintf wrongly conclude that the printing of zero characters means we are out of memory. libctf/ * ctf-types.c (ctf_type_aname): Return ECTF_CORRUPT if ints, floats or typedefs have no name. Fix comment typo. --- libctf/ChangeLog | 5 +++++ libctf/ctf-types.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libctf/ChangeLog b/libctf/ChangeLog index 78f8f7e3a6c..f0e20011f39 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,3 +1,8 @@ +2020-07-22 Nick Alcock + + * ctf-types.c (ctf_type_aname): Return ECTF_CORRUPT if + ints, floats or typedefs have no name. Fix comment typo. + 2020-07-22 Nick Alcock * ctf-create.c (ctf_add_slice): Support slices of any kind that diff --git a/libctf/ctf-types.c b/libctf/ctf-types.c index f5a1fc0ae12..db42b9e8a90 100644 --- a/libctf/ctf-types.c +++ b/libctf/ctf-types.c @@ -316,7 +316,7 @@ ctf_id_t ctf_lookup_by_rawhash (ctf_file_t *fp, ctf_names_t *np, const char *nam return id; } -/* Lookup the given type ID and return its name as a new dynamcally-allocated +/* Lookup the given type ID and return its name as a new dynamically-allocated string. */ char * @@ -379,6 +379,15 @@ ctf_type_aname (ctf_file_t *fp, ctf_id_t type) case CTF_K_INTEGER: case CTF_K_FLOAT: case CTF_K_TYPEDEF: + /* Integers, floats, and typedefs must always be named types. */ + + if (name[0] == '\0') + { + ctf_set_errno (fp, ECTF_CORRUPT); + ctf_decl_fini (&cd); + return NULL; + } + ctf_decl_sprintf (&cd, "%s", name); break; case CTF_K_POINTER: -- 2.30.2