Skip to content
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.

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

ORC-589: [C++] add checks about negative dictionary entry lengths #468

Merged
merged 3 commits into from
Jan 15, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 2 additions & 0 deletions c++/src/ColumnReader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,8 @@ namespace orc {
lengthDecoder->next(lengthArray + 1, dictSize, nullptr);
lengthArray[0] = 0;
for(uint32_t i = 1; i < dictSize + 1; ++i) {
if (lengthArray[i] < 0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add curly brace here even for a single line if-statement.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

throw ParseError("Negative dictionary entry length");
lengthArray[i] += lengthArray[i - 1];
}
dictionary->dictionaryBlob.resize(
Expand Down
1 change: 1 addition & 0 deletions c++/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ add_executable (orc-test
TestColumnReader.cc
TestColumnStatistics.cc
TestCompression.cc
TestCorruptFiles.cc
TestDecompression.cc
TestDecimal.cc
TestDictionaryEncoding.cc
Expand Down
56 changes: 56 additions & 0 deletions c++/test/TestCorruptFiles.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "orc/OrcFile.hh"
#include "orc/Reader.hh"

#include "Adaptor.hh"

#include "wrap/gmock.h"
#include "wrap/gtest-wrapper.h"

namespace orc {

TEST(TestCorruptFiles, testNegativeDictEntryLengths) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think moving this into TestFileScan.testErrorHandling in TestFileScan.cc is simpler.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done


Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove empty line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

std::stringstream ss;
if(const char* example_dir = std::getenv("ORC_EXAMPLE_DIR")) {
ss << example_dir;
} else {
ss << "../../../examples";
}
ss << "/corrupt/negative_dict_entry_lengths.orc";
try {
std::unique_ptr<orc::Reader> reader =
createReader(readLocalFile(ss.str().c_str()), ReaderOptions());

RowReaderOptions row_reader_opts;
row_reader_opts.include({"date_string_col"});
std::unique_ptr<orc::RowReader> row_reader =
reader->createRowReader(row_reader_opts);
std::unique_ptr<ColumnVectorBatch> column_vector_batch =
row_reader->createRowBatch(1024);
row_reader->next(*column_vector_batch);
}
catch (ParseError& err) {
std::string msg(err.what());
EXPECT_TRUE(msg.find("Negative dictionary entry length") != std::string::npos);
}
}

} // namespace
Binary file added examples/corrupt/negative_dict_entry_lengths.orc
Binary file not shown.