Skip to content

[jazzy] Add validation for empty file path in compression process (backport #2398) #2411

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

Open
mergify wants to merge 1 commit into
base: jazzy
Choose a base branch
from
+8 −3
Open

[jazzy] Add validation for empty file path in compression process (backport #2398) #2411

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
11 changes: 8 additions & 3 deletions rosbag2_compression/src/rosbag2_compression/sequential_compression_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,17 @@ void SequentialCompressionWriter::compress_file(
BaseCompressorInterface & compressor,
const std::string & file_relative_to_bag)
{
if (file_relative_to_bag.empty()) {
ROSBAG2_COMPRESSION_LOG_DEBUG_STREAM("Cannot compress file with empty path relative to bag."
" Skipping compression.");
return;
}
const auto file_relative_to_pwd = fs::path(base_folder_) / file_relative_to_bag;
ROSBAG2_COMPRESSION_LOG_INFO_STREAM("Compressing file: " << file_relative_to_pwd.string());

if (fs::exists(file_relative_to_pwd) &&
if (fs::exists(file_relative_to_pwd) && !fs::is_directory(file_relative_to_pwd) &&
fs::file_size(file_relative_to_pwd) > 0u)
{
ROSBAG2_COMPRESSION_LOG_INFO_STREAM("Compressing file: " << file_relative_to_pwd.string());
const auto compressed_uri = compressor.compress_uri(file_relative_to_pwd.string());
const auto relative_compressed_uri = fs::path(compressed_uri).filename();
{
Expand Down Expand Up @@ -367,7 +372,7 @@ void SequentialCompressionWriter::compress_file(
"will not be halted because the compressed output was successfully created.");
}
} else {
ROSBAG2_COMPRESSION_LOG_DEBUG_STREAM(
ROSBAG2_COMPRESSION_LOG_WARN_STREAM(
"Removing last file: \"" << file_relative_to_pwd.string() <<
"\" because it either is empty or does not exist.");
}
Expand Down
Loading