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

Jump to bottom

fix(c/driver/postgresql): Fix segfault associated with uninitialized copy_reader_ #964

Merged
merged 12 commits into from
Aug 10, 2023
Merged

fix(c/driver/postgresql): Fix segfault associated with uninitialized copy_reader_ #964

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a87481f
fix(c/driver/postgresql): check if copy reader is initialized in GetS…
Aug 4, 2023
f158e89
Use a separate bool flag to track reader state and move reset() from …
Aug 7, 2023
5ac6830
Move is_finished_, if -> assert
Aug 7, 2023
496b04b
#include <cassert>
Aug 7, 2023
4230774
Move is_finished_ from constructor to initializer list, remove commen…
Aug 7, 2023
5e7289d
Set is_finished_ to be true after checking server side response
Aug 8, 2023
c50cc3a
(draft) Try fixing the segfaults without the bool flag
Aug 9, 2023
6646770
Revert previous change without flags, going back to the drawing board
Aug 9, 2023
4276583
Remove ResetQuery() and use the is_finished_ bool flag instead for tr…
Aug 10, 2023
fa7f0ef
Typo in test / forgot to run pytest on this
Aug 10, 2023
aa2356e
pre-commit lint
Aug 10, 2023
7100655
Make sure Release actually releases (more than just copy_reader_)
Aug 10, 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
17 changes: 13 additions & 4 deletions c/driver/postgresql/statement.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,12 @@ struct BindStream {
} // namespace

int TupleReader::GetSchema(struct ArrowSchema* out) {
if (copy_reader_ == nullptr) {
StringBuilderAppend(&error_builder_,
"[libpq] Copy reader not initialized before calling GetSchema");
ywc88 marked this conversation as resolved.
Show resolved Hide resolved
return EINVAL;
}

int na_res = copy_reader_->GetSchema(out);
if (out->release == nullptr) {
StringBuilderAppend(&error_builder_,
Expand Down Expand Up @@ -628,7 +634,7 @@ void TupleReader::ResetQuery() {
}

int TupleReader::GetNext(struct ArrowArray* out) {
if (!copy_reader_) {
if (is_finished_) {
out->release = nullptr;
return 0;
}
Expand Down Expand Up @@ -662,9 +668,6 @@ int TupleReader::GetNext(struct ArrowArray* out) {
struct ArrowArray tmp;
NANOARROW_RETURN_NOT_OK(BuildOutput(&tmp, &error));

// Clear the copy reader to mark this reader as finished
copy_reader_.reset();

ywc88 marked this conversation as resolved.
Show resolved Hide resolved
// Check the server-side response
result_ = PQgetResult(conn_);
const int pq_status = PQresultStatus(result_);
Expand Down Expand Up @@ -696,6 +699,12 @@ void TupleReader::Release() {
PQfreemem(pgbuf_);
pgbuf_ = nullptr;
}

// Clear the copy reader to mark this reader as finished
ywc88 marked this conversation as resolved.
Show resolved Hide resolved
if (copy_reader_) {
copy_reader_.reset();
is_finished_ = true;
}
}

void TupleReader::ExportTo(struct ArrowArrayStream* stream) {
Expand Down
2 changes: 2 additions & 0 deletions c/driver/postgresql/statement.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class TupleReader final {
StringBuilderInit(&error_builder_, 0);
data_.data.as_char = nullptr;
data_.size_bytes = 0;
is_finished_ = false;
ywc88 marked this conversation as resolved.
Show resolved Hide resolved
}

int GetSchema(struct ArrowSchema* out);
Expand Down Expand Up @@ -85,6 +86,7 @@ class TupleReader final {
std::unique_ptr<PostgresCopyStreamReader> copy_reader_;
int64_t row_id_;
int64_t batch_size_hint_bytes_;
bool is_finished_;
};

class PostgresStatement {
Expand Down
Loading