Skip to content

Crash fix: copy the error message out of ErrorContext before taking it #61

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

Merged
dpage merged 2 commits into from
Aug 12, 2026
Merged

Crash fix: copy the error message out of ErrorContext before taking it #61

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba12c0f
Copy the error message out of ErrorContext before taking it
mason-sharp Aug 12, 2026
7c046ea
Correct the comment on the ErrorContext switch
dpage Aug 12, 2026
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: 16 additions & 1 deletion src/worker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,17 +242,32 @@ queue_item_begin(int64 queue_id, int attempts, int max_attempts)
static void
queue_item_note_error(void)
{
ErrorData *edata;
ErrorData *edata;
MemoryContext oldcontext;

if (failed_item_queue_id < 0)
return;

/*
* CopyErrorData() copies into the current context and asserts it is not
* ErrorContext, which is exactly where a PG_CATCH() body starts:
* errfinish() switches there and deliberately leaves it set that way when
* it re-throws. Left alone this aborts an assert-enabled build outright;
* on a release build it instead eats into the space ErrorContext reserves
* so that reporting an error can never itself fail, which is what the
* assertion protects. The copy is only needed until the message has been
* taken, so any other context will do.
*/
oldcontext = MemoryContextSwitchTo(TopMemoryContext);

edata = CopyErrorData();

if (edata->message != NULL)
strlcpy(failed_item_error, edata->message, sizeof(failed_item_error));

FreeErrorData(edata);

MemoryContextSwitchTo(oldcontext);
}

/*
Expand Down
Loading