Skip to content

MINOR: [C++][ORC] Avoid signed overflow when converting timestamps #50035

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
jmestwa-coder wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −17
Open

MINOR: [C++][ORC] Avoid signed overflow when converting timestamps #50035

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
36 changes: 19 additions & 17 deletions cpp/src/arrow/adapters/orc/util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "arrow/util/bitmap_ops.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/int_util_overflow.h"
#include "arrow/util/key_value_metadata.h"
#include "arrow/util/range.h"
#include "arrow/util/string.h"
Expand Down Expand Up @@ -200,26 +201,27 @@ Status AppendTimestampBatch(liborc::ColumnVectorBatch* column_vector_batch,
auto builder = checked_cast<TimestampBuilder*>(abuilder);
auto batch = checked_cast<liborc::TimestampVectorBatch*>(column_vector_batch);

if (length == 0) {
return Status::OK();
}

const uint8_t* valid_bytes = nullptr;
if (batch->hasNulls) {
valid_bytes = reinterpret_cast<const uint8_t*>(batch->notNull.data()) + offset;
}

const int64_t* seconds = batch->data.data() + offset;
const int64_t* nanos = batch->nanoseconds.data() + offset;

auto transform_timestamp = [seconds, nanos](int64_t index) {
return seconds[index] * kOneSecondNanos + nanos[index];
};

auto transform_range = internal::MakeLazyRange(transform_timestamp, length);

RETURN_NOT_OK(
builder->AppendValues(transform_range.begin(), transform_range.end(), valid_bytes));
const bool has_nulls = batch->hasNulls;
RETURN_NOT_OK(builder->Reserve(length));
for (int64_t i = 0; i < length; i++) {
if (has_nulls && !batch->notNull[offset + i]) {
builder->UnsafeAppendNull();
continue;
}
// A timestamp past ~year 2262 does not fit in int64 nanoseconds; computing
// it with a bare `seconds * kOneSecondNanos` is signed overflow.
int64_t value;
if (ARROW_PREDICT_FALSE(
internal::MultiplyWithOverflow(seconds[i], kOneSecondNanos, &value) ||
internal::AddWithOverflow(value, nanos[i], &value))) {
return Status::Invalid("ORC timestamp (", seconds[i], "s + ", nanos[i],
"ns) is out of range for nanosecond resolution");
}
builder->UnsafeAppend(value);
}
return Status::OK();
}

Expand Down