Skip to content

ARROW-1136: [C++] Add null checks for invalid streams #770

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
wesm wants to merge 2 commits into from
Closed

ARROW-1136: [C++] Add null checks for invalid streams #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc3ec20
Add null checks for invalid streams
wesm Jun 22, 2017
6ae5cd8
Centralize null checking
wesm Jun 22, 2017
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
20 changes: 14 additions & 6 deletions cpp/src/arrow/ipc/reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ static inline FileBlock FileBlockFromFlatbuffer(const flatbuf::Block* block) {
return FileBlock(block->offset(), block->metaDataLength(), block->bodyLength());
}

static inline std::string message_type_name(Message::Type type) {
static inline std::string FormatMessageType(Message::Type type) {
switch (type) {
case Message::SCHEMA:
return "schema";
Expand All @@ -188,14 +188,22 @@ class RecordBatchStreamReader::RecordBatchStreamReaderImpl {
return ReadSchema();
}

Status ReadNextMessage(Message::Type expected_type, std::shared_ptr<Message>* message) {
Status ReadNextMessage(Message::Type expected_type, bool allow_null,
std::shared_ptr<Message>* message) {
RETURN_NOT_OK(ReadMessage(stream_.get(), message));

if (!(*message) && !allow_null) {
std::stringstream ss;
ss << "Expected " << FormatMessageType(expected_type)
<< " message in stream, was null or length 0";
return Status::Invalid(ss.str());
}

if ((*message) == nullptr) { return Status::OK(); }

if ((*message)->type() != expected_type) {
std::stringstream ss;
ss << "Message not expected type: " << message_type_name(expected_type)
ss << "Message not expected type: " << FormatMessageType(expected_type)
<< ", was: " << (*message)->type();
return Status::IOError(ss.str());
}
Expand All @@ -213,7 +221,7 @@ class RecordBatchStreamReader::RecordBatchStreamReaderImpl {

Status ReadNextDictionary() {
std::shared_ptr<Message> message;
RETURN_NOT_OK(ReadNextMessage(Message::DICTIONARY_BATCH, &message));
RETURN_NOT_OK(ReadNextMessage(Message::DICTIONARY_BATCH, false, &message));

std::shared_ptr<Buffer> batch_body;
RETURN_NOT_OK(ReadExact(message->body_length(), &batch_body))
Expand All @@ -227,7 +235,7 @@ class RecordBatchStreamReader::RecordBatchStreamReaderImpl {

Status ReadSchema() {
std::shared_ptr<Message> message;
RETURN_NOT_OK(ReadNextMessage(Message::SCHEMA, &message));
RETURN_NOT_OK(ReadNextMessage(Message::SCHEMA, false, &message));

RETURN_NOT_OK(GetDictionaryTypes(message->header(), &dictionary_types_));

Expand All @@ -243,7 +251,7 @@ class RecordBatchStreamReader::RecordBatchStreamReaderImpl {

Status GetNextRecordBatch(std::shared_ptr<RecordBatch>* batch) {
std::shared_ptr<Message> message;
RETURN_NOT_OK(ReadNextMessage(Message::RECORD_BATCH, &message));
RETURN_NOT_OK(ReadNextMessage(Message::RECORD_BATCH, true, &message));

if (message == nullptr) {
// End of stream
Expand Down
10 changes: 10 additions & 0 deletions python/pyarrow/tests/test_ipc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ class TestFile(MessagingTest, unittest.TestCase):
def _get_writer(self, sink, schema):
return pa.RecordBatchFileWriter(sink, schema)

def test_empty_file(self):
buf = io.BytesIO(b'')
with pytest.raises(pa.ArrowInvalid):
pa.open_file(buf)

def test_simple_roundtrip(self):
batches = self.write_batches()
file_contents = self._get_source()
Expand Down Expand Up @@ -101,6 +106,11 @@ class TestStream(MessagingTest, unittest.TestCase):
def _get_writer(self, sink, schema):
return pa.RecordBatchStreamWriter(sink, schema)

def test_empty_stream(self):
buf = io.BytesIO(b'')
with pytest.raises(pa.ArrowInvalid):
pa.open_stream(buf)

def test_simple_roundtrip(self):
batches = self.write_batches()
file_contents = self._get_source()
Expand Down