Attachment #26584 for bug #63576

View | Details | Raw Unified | Return to bug 63576
Collapse All | Expand All




			file_badseek(ms);
			return -1;
		}
		bufsize = read(fd, nbuf, ((ph_filesz < sizeof(nbuf)) ? ph_filesz : sizeof(nbuf)));
		if (bufsize == -1) {
			file_badread(ms);
			return -1;

	}

	offset = ELF_ALIGN(doff + descsz);
	if (doff + descsz > size) {
		return offset;
	}


				file_badseek(ms);
				return -1;
			}
			bufsize = read(fd, nbuf,
				((ph_filesz < sizeof(nbuf)) ? ph_filesz : sizeof(nbuf)));
			if (bufsize == -1) {
				file_badread(ms);
				return -1;

Return to bug 63576

Lines 256-262 Link Here

(-)file-4.10/src/readelf.c.orig (-3 / +4 lines)
256	file_badseek(ms);	256	file_badseek(ms);
257	return -1;	257	return -1;
258	}	258	}
259	bufsize = read(fd, nbuf, sizeof(nbuf));	259	bufsize = read(fd, nbuf, ((ph_filesz < sizeof(nbuf)) ? ph_filesz : sizeof(nbuf)));
260	if (bufsize == -1) {	260	if (bufsize == -1) {
261	file_badread(ms);	261	file_badread(ms);
262	return -1;	262	return -1;
Lines 327-333 Link Here
327	}	327	}
328		328
329	offset = ELF_ALIGN(doff + descsz);	329	offset = ELF_ALIGN(doff + descsz);
330	if (offset + descsz > size) {	330	if (doff + descsz > size) {
331	return offset;	331	return offset;
332	}	332	}
333		333
Lines 693-699 Link Here
693	file_badseek(ms);	693	file_badseek(ms);
694	return -1;	694	return -1;
695	}	695	}
696	bufsize = read(fd, nbuf, sizeof(nbuf));	696	bufsize = read(fd, nbuf,
		697	((ph_filesz < sizeof(nbuf)) ? ph_filesz : sizeof(nbuf)));
697	if (bufsize == -1) {	698	if (bufsize == -1) {
698	file_badread(ms);	699	file_badread(ms);
699	return -1;	700	return -1;