diff options
| author | Nick Alcock <nick.alcock@oracle.com> | 2021-02-18 16:56:23 +0000 |
|---|---|---|
| committer | Nick Alcock <nick.alcock@oracle.com> | 2021-03-02 15:08:03 +0000 |
| commit | eaa2913a7acead8654e7e79ba13c0d22fd70a452 (patch) | |
| tree | 9c83d0400a69f9c4b3551f6b8c3b6f3c1e6f4af9 | |
| parent | b80e421f9136117389be9d96210b35b3d562d725 (diff) | |
| download | gdb-eaa2913a7acead8654e7e79ba13c0d22fd70a452.zip gdb-eaa2913a7acead8654e7e79ba13c0d22fd70a452.tar.gz gdb-eaa2913a7acead8654e7e79ba13c0d22fd70a452.tar.bz2 | |
libctf: ctf_archive_next should set the parent name consistently
The top level of CTF containers is a "CTF archive", which contains a
collection of named members (each a CTF dictionary). In the serialized
file format, this is optional and skipped if the archive would have only
one member, as when no ambiguous types are present: so it is commonplace
to have a simple ctf_dict_t written out, with no archive container
wrapped around it.
But, unlike ctf_archive_iter, ctf_archive_next didn't quite handle this
case right. It should set the name of this fake "member" to
_CTF_SECTION, i.e. ".ctf", but it was failing to do so, so callers got
an unintialized variable back instead and were understandably confused.
So set the name properly.
libctf/ChangeLog
2021-03-02 Nick Alcock <nick.alcock@oracle.com>
* ctf-archive.c (ctf_archive_next): Set the name of parents in
single-member archives.
| -rw-r--r-- | libctf/ChangeLog | 5 | ||||
| -rw-r--r-- | libctf/ctf-archive.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libctf/ChangeLog b/libctf/ChangeLog index da27a8f..db44cae 100644 --- a/libctf/ChangeLog +++ b/libctf/ChangeLog @@ -1,3 +1,8 @@ +2021-03-02 Nick Alcock <nick.alcock@oracle.com> + + * ctf-archive.c (ctf_archive_next): Set the name of parents in + single-member archives. + 2021-02-26 Alan Modra <amodra@gmail.com> * Makefile.in: Regenerate. diff --git a/libctf/ctf-archive.c b/libctf/ctf-archive.c index 6d9c75c..6e1bf15 100644 --- a/libctf/ctf-archive.c +++ b/libctf/ctf-archive.c @@ -1165,6 +1165,8 @@ ctf_archive_next (const ctf_archive_t *wrapper, ctf_next_t **it, const char **na if (!skip_parent) { wrapper->ctfi_dict->ctf_refcnt++; + if (name) + *name = _CTF_SECTION; return wrapper->ctfi_dict; } } |