Skip to content

[ntuple] RNTupleDecompressor::Unzip: replace some asserts with exceptions #20229

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

Merged
merged 1 commit into from
Nov 5, 2025
+23 −6
Merged

[ntuple] RNTupleDecompressor::Unzip: replace some asserts with exceptions #20229

Show file tree
Hide file tree
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
16 changes: 10 additions & 6 deletions tree/ntuple/inc/ROOT/RNTupleZip.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include <RZip.h>
#include <TError.h>

#include <ROOT/RError.hxx>

#include <algorithm>
#include <array>
#include <cstring>
Expand Down Expand Up @@ -116,15 +118,17 @@ public:
int szSource;
int szTarget;
int retval = R__unzip_header(&szSource, source, &szTarget);
R__ASSERT(retval == 0);
R__ASSERT(szSource > 0);
R__ASSERT(szTarget > szSource);
R__ASSERT(static_cast<unsigned int>(szSource) <= nbytes);
R__ASSERT(static_cast<unsigned int>(szTarget) <= dataLen);
if (R__unlikely(!((retval == 0) && (szSource > 0) && (szTarget > szSource) &&
(static_cast<unsigned int>(szSource) <= nbytes) &&
(static_cast<unsigned int>(szTarget) <= dataLen)))) {
throw ROOT::RException(R__FAIL("failed to unzip buffer header"));
}

int unzipBytes = 0;
R__unzip(&szSource, source, &szTarget, target, &unzipBytes);
R__ASSERT(unzipBytes == szTarget);
if (R__unlikely(unzipBytes != szTarget))
throw ROOT::RException(R__FAIL(std::string("unexpected length after unzipping the buffer (wanted: ") +
std::to_string(szTarget) + ", got: " + std::to_string(unzipBytes) + ")"));

target += szTarget;
source += szSource;
Expand Down
13 changes: 13 additions & 0 deletions tree/ntuple/test/ntuple_zip.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,16 @@ TEST(RNTupleZip, LargeWithOutputBuffer)
RNTupleDecompressor::Unzip(zipBuffer.get(), szZip, N, unzipBuffer.get());
EXPECT_EQ(data, std::string_view(unzipBuffer.get(), N));
}

TEST(RNTupleZip, CorruptedInput)
{
std::string data = "xxxxxxxxxxxxxxxxxxxxxxxx";
auto zipBuffer = MakeUninitArray<unsigned char>(data.length());
auto szZipped = RNTupleCompressor::Zip(data.data(), data.length(), 101, zipBuffer.get());
EXPECT_LT(szZipped, data.length());
auto unzipBuffer = MakeUninitArray<unsigned char>(data.length());
// corrupt the buffer header
memset(zipBuffer.get() + 1, 0xCD, 5);
EXPECT_THROW(RNTupleDecompressor::Unzip(zipBuffer.get(), szZipped, data.length(), unzipBuffer.get()),
ROOT::RException);
}
Loading