Skip to content

fix(pgsql): guard monitor task removal against self-move #6039

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

Open
Snehil-Shah wants to merge 1 commit into
base: v3.0
Choose a base branch
from
+6 −4
Open

fix(pgsql): guard monitor task removal against self-move #6039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions lib/PgSQL_Monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,13 +1270,15 @@ void add_task(
}

void rm_task_fast(task_poll_t& task_poll, size_t idx) {
if (idx > task_poll.size || idx < 0) {
proxy_error("Receveid invalid task index idx=%lu", idx);
if (idx >= task_poll.size) {
Comment thread
Snehil-Shah marked this conversation as resolved.
proxy_error("Received invalid task index idx=%zu\n", idx);
Comment on lines +1273 to +1274

@Snehil-Shah Snehil-Shah Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Drive-by correctness fix. idx is unsigned so the second check was a no-op, and idx == task_poll.size is also an invalid task index.

assert(0);
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

task_poll.fds[idx] = task_poll.fds[task_poll.size - 1];
task_poll.tasks[idx] = std::move(task_poll.tasks[task_poll.size - 1]);
if (idx != task_poll.size - 1) {
task_poll.fds[idx] = task_poll.fds[task_poll.size - 1];
task_poll.tasks[idx] = std::move(task_poll.tasks[task_poll.size - 1]);
}
task_poll.size--;
}

Expand Down