| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 |
- Subject: Bail out on partial reads, from Alexander Cherepanov
- Upstream-Author: Christos Zoulas <christos@zoulas.com>
- Date: Tue Dec 16 20:53:05 2014 +0000
- Origin: FILE5_21-10-g445c8fb
- Last-Update: 2015-01-05
- (prequisite for TEMP-0000000-B67840)
- diff --git a/src/readelf.c b/src/readelf.c
- index fd4a19f..544c22b 100644
- --- a/src/readelf.c
- +++ b/src/readelf.c
- @@ -327,7 +327,7 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
- * Loop through all the program headers.
- */
- for ( ; num; num--) {
- - if (pread(fd, xph_addr, xph_sizeof, off) == -1) {
- + if (pread(fd, xph_addr, xph_sizeof, off) < (ssize_t)xph_sizeof) {
- file_badread(ms);
- return -1;
- }
- @@ -930,6 +930,7 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
- uint64_t cap_hw1 = 0; /* SunOS 5.x hardware capabilites */
- uint64_t cap_sf1 = 0; /* SunOS 5.x software capabilites */
- char name[50];
- + ssize_t namesize;
-
- if (size != xsh_sizeof) {
- if (file_printf(ms, ", corrupted section header size") == -1)
- @@ -949,7 +950,7 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
- stripped = 0;
-
- for ( ; num; num--) {
- - if (pread(fd, xsh_addr, xsh_sizeof, off) == -1) {
- + if (pread(fd, xsh_addr, xsh_sizeof, off) < (ssize_t)xsh_sizeof) {
- file_badread(ms);
- return -1;
- }
- @@ -979,7 +980,7 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
- " for note");
- return -1;
- }
- - if (pread(fd, nbuf, xsh_size, xsh_offset) == -1) {
- + if (pread(fd, nbuf, xsh_size, xsh_offset) < (ssize_t)xsh_size) {
- file_badread(ms);
- free(nbuf);
- return -1;
- @@ -1133,7 +1134,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
- }
-
- for ( ; num; num--) {
- - if (pread(fd, xph_addr, xph_sizeof, off) == -1) {
- + if (pread(fd, xph_addr, xph_sizeof, off) < (ssize_t)xph_sizeof) {
- file_badread(ms);
- return -1;
- }
|
