LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-06 02:55:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

gunzip: Fail gracefully on bad input

Browse Source 
Instead of crashing on a missing input file, looping forever on an
invalid gzip compressed file, and crashing on permissions issues in
the output file, handle all issues gracefully by logging and returning.
This commit is contained in:
Idan Horowitz 2021-03-26 18:35:30 +03:00 committed by Andreas Kling
parent 0b799dd3b7
commit c01f4c3ed8
Notes: sideshowbarker 2024-07-18 21:03:34 +09:00 
Author: https://github.com/IdanHo
Commit: https://github.com/SerenityOS/serenity/commit/c01f4c3ed87
Pull-request: https://github.com/SerenityOS/serenity/pull/5959
Reviewed-by: https://github.com/awesomekling
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Userland/Utilities/gunzip.cpp
View File

@ -29,16 +29,18 @@
#include <LibCore/FileStream.h>
#include <unistd.h>
static void decompress_file(Buffered<Core::InputFileStream>& input_stream, Buffered<Core::OutputFileStream>& output_stream)
static bool decompress_file(Buffered<Core::InputFileStream>& input_stream, Buffered<Core::OutputFileStream>& output_stream)
{
auto gzip_stream = Compress::GzipDecompressor { input_stream };
u8 buffer[4096];
while (!gzip_stream.unreliable_eof()) {
while (!gzip_stream.has_any_error() && !gzip_stream.unreliable_eof()) {
const auto nread = gzip_stream.read({ buffer, sizeof(buffer) });
output_stream.write_or_error({ buffer, nread });
}
return !gzip_stream.handle_any_error();
}
int main(int argc, char** argv)
@ -65,17 +67,35 @@ int main(int argc, char** argv)
auto input_stream_result = Core::InputFileStream::open_buffered(input_filename);
if (input_stream_result.is_error()) {
warnln("Failed opening input file for reading: {}", input_stream_result.error());
return 1;
}
auto success = false;
if (write_to_stdout) {
auto stdout = Core::OutputFileStream::stdout_buffered();
decompress_file(input_stream_result.value(), stdout);
success = decompress_file(input_stream_result.value(), stdout);
} else {
auto output_stream_result = Core::OutputFileStream::open_buffered(output_filename);
decompress_file(input_stream_result.value(), output_stream_result.value());
if (output_stream_result.is_error()) {
warnln("Failed opening output file for writing: {}", output_stream_result.error());
return 1;
}
success = decompress_file(input_stream_result.value(), output_stream_result.value());
}
if (!success) {
warnln("Failed gzip decompressing input file");
return 1;
}
if (!keep_input_files) {
const auto retval = unlink(String { input_filename }.characters());
VERIFY(retval == 0);
if (retval != 0) {
warnln("Failed removing input file");
return 1;
}
}
}
return 0;
}