aboutsummaryrefslogtreecommitdiff
path: root/libctf
diff options
context:
space:
mode:
Diffstat (limited to 'libctf')
-rw-r--r--libctf/ChangeLog7
-rw-r--r--libctf/ctf-open.c7
2 files changed, 11 insertions, 3 deletions
diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index 5294cae..66423cf 100644
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,5 +1,12 @@
2021-09-27 Nick Alcock <nick.alcock@oracle.com>
+ * ctf-open.c (ctf_bufopen_internal): Don't complain about corrupt
+ function index symtypetab sections if this is an old-format
+ function symtypetab section (which should be ignored in any case).
+ Fix bad grammar.
+
+2021-09-27 Nick Alcock <nick.alcock@oracle.com>
+
* configure: Regenerate.
* Makefile.in: Regenerate.
diff --git a/libctf/ctf-open.c b/libctf/ctf-open.c
index 9e2c570..caeff06 100644
--- a/libctf/ctf-open.c
+++ b/libctf/ctf-open.c
@@ -1449,7 +1449,7 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect,
!= hp->cth_funcoff - hp->cth_objtoff))
{
ctf_err_warn (NULL, 0, ECTF_CORRUPT,
- _("Object index section exists is neither empty nor the "
+ _("Object index section is neither empty nor the "
"same length as the object section: %u versus %u "
"bytes"), hp->cth_funcoff - hp->cth_objtoff,
hp->cth_funcidxoff - hp->cth_objtidxoff);
@@ -1458,10 +1458,11 @@ ctf_bufopen_internal (const ctf_sect_t *ctfsect, const ctf_sect_t *symsect,
if ((hp->cth_varoff - hp->cth_funcidxoff != 0) &&
(hp->cth_varoff - hp->cth_funcidxoff
- != hp->cth_objtidxoff - hp->cth_funcoff))
+ != hp->cth_objtidxoff - hp->cth_funcoff) &&
+ (hp->cth_flags & CTF_F_NEWFUNCINFO))
{
ctf_err_warn (NULL, 0, ECTF_CORRUPT,
- _("Function index section exists is neither empty nor the "
+ _("Function index section is neither empty nor the "
"same length as the function section: %u versus %u "
"bytes"), hp->cth_objtidxoff - hp->cth_funcoff,
hp->cth_varoff - hp->cth_funcidxoff);