database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Don't fail on libpq-generated error reports in pg_amcheck.

Browse Source 
An error PGresult generated by libpq itself, such as a report of
connection loss, won't have broken-down error fields.
should_processing_continue() blithely assumed that
PG_DIAG_SEVERITY_NONLOCALIZED would always be present, and would
dump core if it wasn't.

Per grepping to see if 6d157e7cb's mistake was repeated elsewhere.
This commit is contained in:
Tom Lane 2022-06-06 11:26:57 -04:00
parent 6d157e7cb8
commit 51da231597
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_amcheck/pg_amcheck.c
View File

@ -930,6 +930,8 @@ should_processing_continue(PGresult *res)
/* This is expected but requires closer scrutiny */ /* This is expected but requires closer scrutiny */
case PGRES_FATAL_ERROR: case PGRES_FATAL_ERROR:
severity = PQresultErrorField(res, PG_DIAG_SEVERITY_NONLOCALIZED); severity = PQresultErrorField(res, PG_DIAG_SEVERITY_NONLOCALIZED);
if (severity == NULL)
return false; /* libpq failure, probably lost connection */
if (strcmp(severity, "FATAL") == 0) if (strcmp(severity, "FATAL") == 0)
return false; return false;
if (strcmp(severity, "PANIC") == 0) if (strcmp(severity, "PANIC") == 0)