diff options
| author | Mark Wielaard <mark@klomp.org> | 2022-05-10 12:31:04 +0200 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2022-05-14 15:08:47 +0200 |
| commit | f35268b20ac2172e3801851460d1a569615cdfab (patch) | |
| tree | 390924ea07f7139edd3058abbda033fa736aa2e5 /src | |
| parent | 5beca45e639f153ed08109dc904cd9bc74e094e8 (diff) | |
| download | elfutils-f35268b20ac2172e3801851460d1a569615cdfab.tar.gz | |
elfcompress: Add sanity checks to make sure to not override variable
The process_file code is a little tricky. Add sanity checks to make
sure shstrtab_name, shstrtab_newname and symstrents are only set once.
Signed-off-by: Mark Wielaard <mark@klomp.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/elfcompress.c | 24 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fd87ce2f..ae09eb1f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2022-05-10 Mark Wielaard <mark@klomp.org> + + * elfcompress.c (process_file): Sanity check shstrtab_name, + shstrtab_newname and symstrents are only set once. + 2022-04-24 Mark Wielaard <mark@klomp.org> * elfclassify.c (main): Use classify_flag_no_stdin for no-std in options. diff --git a/src/elfcompress.c b/src/elfcompress.c index 92f2fac8..6f18e47d 100644 --- a/src/elfcompress.c +++ b/src/elfcompress.c @@ -730,6 +730,15 @@ process_file (const char *fname) { shstrtab_size = size; shstrtab_compressed = T_COMPRESS_GNU; + if (shstrtab_name != NULL + || shstrtab_newname != NULL) + { + error (0, 0, "Internal error," + " shstrtab_name already set," + " while handling section [%zd] %s", + ndx, sname); + goto cleanup; + } shstrtab_name = xstrdup (sname); shstrtab_newname = xstrdup (newname); } @@ -786,6 +795,15 @@ process_file (const char *fname) { shstrtab_size = size; shstrtab_compressed = T_COMPRESS_ZLIB; + if (shstrtab_name != NULL + || shstrtab_newname != NULL) + { + error (0, 0, "Internal error," + " shstrtab_name already set," + " while handling section [%zd] %s", + ndx, sname); + goto cleanup; + } shstrtab_name = xstrdup (sname); shstrtab_newname = (newname == NULL ? NULL : xstrdup (newname)); @@ -919,6 +937,12 @@ process_file (const char *fname) } size_t elsize = gelf_fsize (elfnew, ELF_T_SYM, 1, EV_CURRENT); size_t syms = symd->d_size / elsize; + if (symstrents != NULL) + { + error (0, 0, "Internal error, symstrents already set," + " while handling section [%zd] %s", ndx, name); + goto cleanup; + } symstrents = xmalloc (syms * sizeof (Dwelf_Strent *)); for (size_t i = 0; i < syms; i++) { |