diff options
| author | Ulrich Drepper <[email protected]> | 2007-02-15 19:40:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <[email protected]> | 2007-02-15 19:40:37 +0000 |
| commit | 903c1162c0c2afd0d962f6b481edfec0e0209b83 (patch) | |
| tree | e595475e38e97b3d9b041152e01e32349be70abd /src | |
| parent | 65c5c2dc27004e21398f3607832b9e1484e4fdbe (diff) | |
propagate from branch 'com.redhat.elfutils.roland.pending' (head e723b1541850630f0047cf0c73d64c909529f439)
to branch 'com.redhat.elfutils' (head 4e5f7cffa97269b8cc9232cd1e299a2e1f3a819c)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/readelf.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 26920df1..bb45f826 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-02-15 Roland McGrath <[email protected]> + + * readelf.c (print_debug): Fix brainos in SHDR test. + 2007-02-05 Roland McGrath <[email protected]> * ar.c: Include <limits.h>, since we use LONG_MAX. diff --git a/src/readelf.c b/src/readelf.c index fd61b369..ab276ec6 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -4953,7 +4953,7 @@ print_debug (Ebl *ebl, GElf_Ehdr *ehdr) GElf_Shdr shdr_mem; GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); - if (shdr != NULL || shdr->sh_type != SHT_PROGBITS) + if (shdr != NULL && shdr->sh_type == SHT_PROGBITS) { static const struct { |