Skip to content

ARROW-10504: [C++] Suppress UBSAN pointer-overflow warning in RapidJSON #8602

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

Closed
bkietz wants to merge 1 commit into from
Closed

ARROW-10504: [C++] Suppress UBSAN pointer-overflow warning in RapidJSON #8602

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
3 changes: 3 additions & 0 deletions cpp/build-support/sanitizer-disallowed-entries.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@
# Seen error:
# thirdparty/gmock-1.7.0/include/gmock/gmock-spec-builders.h:1529:12: runtime error: member call on null pointer of type 'testing::internal::ActionResultHolder<void>'
fun:*testing*internal*InvokeWith*

# Workaround for RapidJSON https://github.com/Tencent/rapidjson/issues/1724
src:*/rapidjson/internal/*
14 changes: 11 additions & 3 deletions cpp/src/arrow/util/bit_block_counter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,19 @@ BitBlockCount BitBlockCounter::NextFourWords() {
return {256, static_cast<int16_t>(total_popcount)};
}

// Prevent pointer arithmetic on nullptr, which is undefined behavior even if the pointer
// is never dereferenced.
inline const uint8_t* EnsureNotNull(const uint8_t* ptr) {
static const uint8_t byte{};
return ptr == nullptr ? &byte : ptr;
}

OptionalBitBlockCounter::OptionalBitBlockCounter(const uint8_t* validity_bitmap,
int64_t offset, int64_t length)
: has_bitmap_(validity_bitmap != nullptr),
position_(0),
length_(length),
counter_(validity_bitmap, offset, length) {}
counter_(EnsureNotNull(validity_bitmap), offset, length) {}

OptionalBitBlockCounter::OptionalBitBlockCounter(
const std::shared_ptr<Buffer>& validity_bitmap, int64_t offset, int64_t length)
Expand Down Expand Up @@ -188,9 +195,10 @@ OptionalBinaryBitBlockCounter::OptionalBinaryBitBlockCounter(const uint8_t* left
: has_bitmap_(HasBitmapFromBitmaps(left_bitmap != nullptr, right_bitmap != nullptr)),
position_(0),
length_(length),
unary_counter_(left_bitmap != nullptr ? left_bitmap : right_bitmap,
unary_counter_(EnsureNotNull(left_bitmap != nullptr ? left_bitmap : right_bitmap),
left_bitmap != nullptr ? left_offset : right_offset, length),
binary_counter_(left_bitmap, left_offset, right_bitmap, right_offset, length) {}
binary_counter_(EnsureNotNull(left_bitmap), left_offset,
EnsureNotNull(right_bitmap), right_offset, length) {}

OptionalBinaryBitBlockCounter::OptionalBinaryBitBlockCounter(
const std::shared_ptr<Buffer>& left_bitmap, int64_t left_offset,
Expand Down