database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Fix setvbuf()-induced crash in libpq_pipeline

Browse Source 
Windows doesn't like setvbuf(..., _IOLBF) and crashes if you use it,
which has been causing the libpq_pipeline failures all along ... and our
own port.h has known about it for a long time: it offers PG_IOLBF that's
defined to _IONBF on that platform.  Follow its advice.

While at it, get rid of a bogus bitshift that used a constant of the
wrong size.  Decorate the constant as LL to fix.  While at it, remove a
pointless addition that only confused matters.

All as diagnosed by Tom Lane.

Discussion: https://postgr.es/m/3458958.1617302154@sss.pgh.pa.us
This commit is contained in:
Alvaro Herrera 2021-04-01 16:25:46 -03:00
parent 3b6c1259f9
commit a68a894f01
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/modules/libpq_pipeline/libpq_pipeline.c
View File

@ -724,8 +724,8 @@ test_pipelined_insert(PGconn *conn, int n_rows)
if (send_step == BI_INSERT_ROWS) if (send_step == BI_INSERT_ROWS)
{ {
snprintf(insert_param_0, MAXINTLEN, "%d", rows_to_send); snprintf(insert_param_0, MAXINTLEN, "%d", rows_to_send);
snprintf(insert_param_1, MAXINT8LEN, "%lld", /* use up some buffer space with a wide value */
(1L << 62) + (long long) rows_to_send); snprintf(insert_param_1, MAXINT8LEN, "%lld", 1LL << 62);
if (PQsendQueryPrepared(conn, "my_insert", if (PQsendQueryPrepared(conn, "my_insert",
2, insert_params, NULL, NULL, 0) == 1) 2, insert_params, NULL, NULL, 0) == 1)
@ -1324,7 +1324,7 @@ main(int argc, char **argv)
pg_fatal("could not open file \"%s\": %m", tracefile); pg_fatal("could not open file \"%s\": %m", tracefile);
/* Make it line-buffered */ /* Make it line-buffered */
setvbuf(trace, NULL, _IOLBF, 0); setvbuf(trace, NULL, PG_IOLBF, 0);
PQtrace(conn, trace); PQtrace(conn, trace);
PQtraceSetFlags(conn, PQtraceSetFlags(conn,