Skip to content

Add bounds checking to OgaSequencesGetSequence C API functions #2257

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
David Fan (jiafatom) wants to merge 2 commits into from
Closed

Add bounds checking to OgaSequencesGetSequence C API functions #2257

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b0bc4
Add bounds checking to OgaSequencesGetSequence C API functions
jiafatom Jul 2, 2026
3033ce2
Reject null shape_dims with non-zero count in OgaCreateTensorFromBuffer
jiafatom Jul 2, 2026
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
17 changes: 15 additions & 2 deletions src/ort_genai_c.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <stdexcept>
#include <cstdint>
#include <cstddef>
#include <limits>
#include "span.h"
#include "ort_genai_c.h"
#include "generators.h"
Expand Down Expand Up @@ -161,10 +162,16 @@ size_t OGA_API_CALL OgaSequencesCount(const OgaSequences* p) {
}

size_t OGA_API_CALL OgaSequencesGetSequenceCount(const OgaSequences* p, size_t sequence) {
if (sequence >= p->size()) {
return 0;
}
return (*p)[sequence].size();
}

const int32_t* OGA_API_CALL OgaSequencesGetSequenceData(const OgaSequences* p, size_t sequence) {
if (sequence >= p->size()) {
return nullptr;
}
return (*p)[sequence].data();
}

Expand Down Expand Up @@ -750,8 +757,14 @@ OgaResult* OGA_API_CALL OgaCreateTensorFromBuffer(void* data, const int64_t* sha
auto ort_element_type = static_cast<ONNXTensorElementDataType>(element_type);
size_t byte_count = Ort::SizeOf(ort_element_type);
auto shape = std::span<const int64_t>{shape_dims, shape_dims_count};
for (size_t i = 0; i < shape_dims_count; i++)
byte_count *= shape_dims[i];
for (size_t i = 0; i < shape_dims_count; i++) {
if (shape_dims[i] < 0)
throw std::runtime_error("shape dimension must be non-negative");
Comment thread
jiafatom marked this conversation as resolved.
const size_t dim = static_cast<size_t>(shape_dims[i]);
if (dim != 0 && byte_count > std::numeric_limits<size_t>::max() / dim)
throw std::runtime_error("tensor byte count overflow");
byte_count *= dim;
}
std::unique_ptr<OrtValue> ort_tensor;
if (data)
ort_tensor = OrtValue::CreateTensor(*p_memory_info, data, byte_count, shape, ort_element_type);
Expand Down
17 changes: 17 additions & 0 deletions test/c_api_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,23 @@ TEST(CAPITests, AppendTokensToSequence) {
#endif
}

TEST(CAPITests, SequencesOutOfBoundsAccess) {
auto sequences = OgaSequences::Create();

std::vector<int32_t> tokens{100, 200, 300};
sequences->Append(tokens.data(), tokens.size());

ASSERT_EQ(sequences->Count(), 1u);
EXPECT_EQ(sequences->SequenceCount(0), tokens.size());
EXPECT_NE(sequences->SequenceData(0), nullptr);

// Out-of-bounds indices must not read past the underlying storage.
EXPECT_EQ(sequences->SequenceCount(1), 0u);
EXPECT_EQ(sequences->SequenceData(1), nullptr);
EXPECT_EQ(sequences->SequenceCount(1000), 0u);
EXPECT_EQ(sequences->SequenceData(1000), nullptr);
}

TEST(CAPITests, MaxLength) {
// Batch size 1 case
std::vector<int32_t> input_ids_0{1, 2, 3, 5, 8};
Expand Down
Loading