From 35ee6fcf9ff0d5bb4fef39557f8fe4e9d8b8937e Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sun, 22 Dec 2019 19:18:29 -0800 Subject: gzip: reject non-gzip files in zlib path. It turns out that zlib defaults to just copying data verbatim if the input isn't in gzip format, rather than rejecting it. Explicitly add a check that zlib isn't doing that. (The toybox inflation path already errors out.) Also add the missing test. --- toys/lsb/gzip.c | 1 + 1 file changed, 1 insertion(+) (limited to 'toys/lsb') diff --git a/toys/lsb/gzip.c b/toys/lsb/gzip.c index 3038495e..049285af 100644 --- a/toys/lsb/gzip.c +++ b/toys/lsb/gzip.c @@ -78,6 +78,7 @@ static int do_deflate(int in_fd, int out_fd, int dd, int level) } if (!(gz = gzdopen(dd ? in_fd : out_fd, b))) perror_exit("gzdopen"); if (dd) { + if (gzdirect(gz)) error_exit("not gzip"); while ((len = gzread(gz, toybuf, sizeof(toybuf))) > 0) if (len != writeall(out_fd, toybuf, len)) break; } else { -- cgit v1.2.3