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.

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

Fix OOB memory access in CSV reader when reading without NA values #13011

Merged
merged 6 commits into from
Apr 5, 2023
Merged

Fix OOB memory access in CSV reader when reading without NA values #13011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c2410a
fix
vuule Mar 25, 2023
140e64c
test
vuule Mar 25, 2023
1c0132b
style
vuule Mar 25, 2023
294ad45
Merge branch 'branch-23.06' into bug-read_csv-no-na-values
vuule Mar 27, 2023
5f919b4
Merge branch 'branch-23.06' into bug-read_csv-no-na-values
vuule Mar 30, 2023
d746e14
Merge branch 'branch-23.06' into bug-read_csv-no-na-values
vuule Apr 3, 2023
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 cpp/src/io/utilities/trie.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ namespace detail {
rmm::device_uvector<serial_trie_node> create_serialized_trie(const std::vector<std::string>& keys,
rmm::cuda_stream_view stream)
{
if (keys.empty()) { return rmm::device_uvector<serial_trie_node>{0, stream}; }

static constexpr int alphabet_size = std::numeric_limits<char>::max() + 1;
struct TreeTrieNode {
using TrieNodePtr = std::unique_ptr<TreeTrieNode>;
Expand Down
6 changes: 3 additions & 3 deletions cpp/src/io/utilities/trie.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2021, NVIDIA CORPORATION.
* Copyright (c) 2018-2023, NVIDIA CORPORATION.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -83,8 +83,8 @@ trie create_serialized_trie(const std::vector<std::string>& keys, rmm::cuda_stre
__host__ __device__ inline bool serialized_trie_contains(device_span<serial_trie_node const> trie,
device_span<char const> key)
{
if (trie.data() == nullptr || trie.empty()) return false;
if (key.empty()) return trie.front().is_leaf;
if (trie.empty()) { return false; }
Copy link
Contributor

Choose a reason for hiding this comment

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

What's wrong with trie.data() == nullptr?

Copy link
Contributor

Choose a reason for hiding this comment

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

I assume it's strictly redundant since a device span with data() == nullptr will always have size 0.

if (key.empty()) { return trie.front().is_leaf; }
auto curr_node = trie.begin() + 1;
for (auto curr_key = key.begin(); curr_key < key.end(); ++curr_key) {
// Don't jump away from root node
Expand Down
16 changes: 16 additions & 0 deletions cpp/tests/io/csv_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,6 +1358,22 @@ TEST_F(CsvReaderTest, nullHandling)

CUDF_TEST_EXPECT_COLUMNS_EQUAL(expect, view.column(0));
}

// Filter enabled, but no NA values
{
cudf::io::csv_reader_options in_opts =
cudf::io::csv_reader_options::builder(cudf::io::source_info{filepath})
.keep_default_na(false)
.dtypes({dtype<cudf::string_view>()})
.header(-1)
.skip_blank_lines(false);
const auto result = cudf::io::read_csv(in_opts);
const auto view = result.tbl->view();
auto expect =
cudf::test::strings_column_wrapper({"NULL", "", "null", "n/a", "Null", "NA", "nan"});

CUDF_TEST_EXPECT_COLUMNS_EQUAL(expect, view.column(0));
}
}

TEST_F(CsvReaderTest, FailCases)
Expand Down