Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check output of fread/fwrite in compression #237

Merged
merged 1 commit into from
Dec 16, 2019
Merged

Check output of fread/fwrite in compression #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions rosbag2_compression/src/rosbag2_compression/zstd_compressor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,16 @@ std::vector<uint8_t> get_input_buffer(
// Allocate and read in
std::vector<uint8_t> decompressed_buffer;
decompressed_buffer.reserve(decompressed_buffer_length);
fread(decompressed_buffer.data(), sizeof(uint8_t), decompressed_buffer_length, file_pointer);

const auto nRead = fread(
decompressed_buffer.data(), sizeof(uint8_t), decompressed_buffer_length, file_pointer);

if (nRead != decompressed_buffer_length) {
ROSBAG2_COMPRESSION_LOG_ERROR_STREAM("Bytes read (" << nRead <<
") != decompressed_buffer_length (" << decompressed_buffer_length << ")!");
// An error indicator is set by this, so the following check will throw
}

if (ferror(file_pointer)) {
fclose(file_pointer);
throw std::runtime_error("Unable to read file");
Expand All @@ -74,7 +83,15 @@ void write_output_buffer(
const std::string & uri)
{
auto file_pointer = open_file(uri.c_str(), "wb");
fwrite(output_buffer, sizeof(uint8_t), output_buffer_length, file_pointer);
const auto nWrite = fwrite(
output_buffer, sizeof(uint8_t), output_buffer_length, file_pointer);

if (nWrite != output_buffer_length) {
ROSBAG2_COMPRESSION_LOG_ERROR_STREAM("Bytes written (" << nWrite <<
") != output_buffer_length (" << output_buffer_length << ")!");
// An error indicator is set by fwrite, so the following check will throw.
}

if (ferror(file_pointer)) {
fclose(file_pointer);
throw std::runtime_error("Unable to write compressed file");
Expand Down