Attachment 26584 Details for Bug 63576

[patch] file-elfreading.patch

file-elfreading.patch (text/plain), 1.09 KB, created by Thomas Biege on 2004-11-30 19:43:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2004-11-30 19:43:40 UTC

Size: 1.09 KB

patch

obsolete

>> and ELF more conservative reading.
>
>http://cvs.pld-linux.org/cgi-bin/cvsweb/SOURCES/Attic/file-readelf-fix.patch?rev=1.3
>
>In fact it contains remaining parts of old version of this patch, which
>weren't been applied when I sent it for the first time to Christos
>(probably were lost during merging with other updates).
>
>--- file-4.10/src/readelf.c.orig	2004-07-24 22:57:22.000000000 +0200
>+++ file-4.10/src/readelf.c	2004-07-26 22:04:48.734248992 +0200
>@@ -256,7 +256,7 @@
> 			file_badseek(ms);
> 			return -1;
> 		}
>-		bufsize = read(fd, nbuf, sizeof(nbuf));
>+		bufsize = read(fd, nbuf, ((ph_filesz < sizeof(nbuf)) ? ph_filesz : sizeof(nbuf)));
> 		if (bufsize == -1) {
> 			file_badread(ms);
> 			return -1;
>@@ -327,7 +327,7 @@
> 	}
> 
> 	offset = ELF_ALIGN(doff + descsz);
>-	if (offset + descsz > size) {
>+	if (doff + descsz > size) {
> 		return offset;
> 	}
> 
>@@ -693,7 +693,8 @@
> 				file_badseek(ms);
> 				return -1;
> 			}
>-			bufsize = read(fd, nbuf, sizeof(nbuf));
>+			bufsize = read(fd, nbuf,
>+				((ph_filesz < sizeof(nbuf)) ? ph_filesz : sizeof(nbuf)));
> 			if (bufsize == -1) {
> 				file_badread(ms);
> 				return -1;

Actions: View | Diff

Attachments on bug 63576: 26516 | 26576 | 26577 | 26580 | 26581 | 26582 | 26583 | 26584 | 26602 | 26612 | 26613 | 26614 | 26615