Martin Pluskal
6685914c85
- fill-buffer.patch: fix allocation of read buffer (bsc#1036941, CVE-2017-8364) OBS-URL: https://build.opensuse.org/request/show/492817 OBS-URL: https://build.opensuse.org/package/show/Archiving/rzip?expand=0&rev=5
34 lines
1006 B
Diff
34 lines
1006 B
Diff
Index: rzip-2.1/stream.c
|
|
===================================================================
|
|
--- rzip-2.1.orig/stream.c
|
|
+++ rzip-2.1/stream.c
|
|
@@ -147,16 +147,16 @@ static int write_u32(int f, u32 v)
|
|
return 0;
|
|
}
|
|
|
|
-static int read_buf(int f, uchar *p, int len)
|
|
+static int read_buf(int f, uchar *p, unsigned int len)
|
|
{
|
|
int ret;
|
|
ret = read(f, p, len);
|
|
if (ret == -1) {
|
|
- err_msg("Read of length %d failed - %s\n", len, strerror(errno));
|
|
+ err_msg("Read of length %u failed - %s\n", len, strerror(errno));
|
|
return -1;
|
|
}
|
|
if (ret != len) {
|
|
- err_msg("Partial read!? asked for %d bytes but got %d\n", len, ret);
|
|
+ err_msg("Partial read!? asked for %u bytes but got %d\n", len, ret);
|
|
return -1;
|
|
}
|
|
return 0;
|
|
@@ -399,7 +399,7 @@ static int fill_buffer(struct stream_inf
|
|
if (sinfo->s[stream].buf) {
|
|
free(sinfo->s[stream].buf);
|
|
}
|
|
- sinfo->s[stream].buf = malloc(u_len);
|
|
+ sinfo->s[stream].buf = malloc(c_len > u_len ? c_len : u_len);
|
|
if (!sinfo->s[stream].buf) {
|
|
return -1;
|
|
}
|