]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Check CREATE_REPLICATION_SLOT response shape in libpqwalreceiver REL_18_STABLE github/REL_18_STABLE
authorFujii Masao <fujii@postgresql.org>
Thu, 16 Jul 2026 04:38:34 +0000 (13:38 +0900)
committerFujii Masao <fujii@postgresql.org>
Thu, 16 Jul 2026 04:39:28 +0000 (13:39 +0900)
Previously, libpqrcv_create_slot() checked only that
CREATE_REPLICATION_SLOT returned PGRES_TUPLES_OK before reading
values from the first row. If the server unexpectedly returned an
invalid result, such as zero rows, PQgetvalue() could return NULL,
leading to a crash while parsing the LSN.

Other replication commands, such as IDENTIFY_SYSTEM, already validate
the response shape before accessing result values, but
CREATE_REPLICATION_SLOT did not.

Fix this by verifying that CREATE_REPLICATION_SLOT response contains
exactly one row with four fields, and report a protocol violation otherwise.

Backpatch to all supported versions.

Bug: #19547
Reported-by: Yuelin Wang <1217816127@qq.com>
Author: Kenny Chen <kennychen851228@gmail.com>
Reviewed-by: Hayato Kuroda <kuroda.hayato@fujitsu.com>
Reviewed-by: Fujii Masao <masao.fujii@gmail.com>
Discussion: https://postgr.es/m/19547-f7986f668f71e788@postgresql.org
Discussion: https://postgr.es/m/CAPXstDtW2iqe+DJAOTQTX+rRziJp2UhZSo1+HRj1COAtbu+nKw@mail.gmail.com
Backpatch-through: 14

src/backend/replication/libpqwalreceiver/libpqwalreceiver.c

index 7fc4ebd76bf3e2ec56698d54f1eea0b6ad8f563c..b0a081dd8810da2a256574535172856cbe4ca55a 100644 (file)
@@ -1024,6 +1024,14 @@ libpqrcv_create_slot(WalReceiverConn *conn, const char *slotname,
                                                slotname, pchomp(PQerrorMessage(conn->streamConn)))));
        }
 
+       /* CREATE_REPLICATION_SLOT returns a single row with four columns */
+       if (PQnfields(res) != 4 || PQntuples(res) != 1)
+               ereport(ERROR,
+                               (errcode(ERRCODE_PROTOCOL_VIOLATION),
+                                errmsg("invalid response from primary server"),
+                                errdetail("Could not create replication slot \"%s\": got %d rows and %d fields, expected %d rows and %d fields.",
+                                                  slotname, PQntuples(res), PQnfields(res), 1, 4)));
+
        if (lsn)
                *lsn = DatumGetLSN(DirectFunctionCall1Coll(pg_lsn_in, InvalidOid,
                                                                                                   CStringGetDatum(PQgetvalue(res, 0, 1))));