database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

libpq_pipeline: Must strdup(optarg) to avoid crash

Browse Source 
I forgot to strdup() when processing argv[].  Apparently many platforms
hide this mistake from users, but in those that don't you may get a
program crash.  Repair.

Per buildfarm member drongo, which is the only one in all the buildfarm
manifesting a problem here.

While at it, move "numrows" processing out of the line of special cases,
and make it getopt's -r instead.  (A similar thing could be done to
'conninfo', but current use of the program doesn't warrant spending time
on that -- nowhere else we use conninfo in so simplistic a manner.)

Discussion: https://postgr.es/m/20210401124850.GA19247@alvherre.pgsql
This commit is contained in:
Alvaro Herrera 2021-04-01 10:04:45 -03:00
parent f82de5c46b
commit dde1a35aee
No known key found for this signature in database
GPG Key ID: 1C20ACB9D5C564AE
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -725,7 +725,7 @@ test_pipelined_insert(PGconn *conn, int n_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", snprintf(insert_param_1, MAXINT8LEN, "%lld",
(long long) rows_to_send); (1L << 62) + (long long) rows_to_send);
if (PQsendQueryPrepared(conn, "my_insert", if (PQsendQueryPrepared(conn, "my_insert",
2, insert_params, NULL, NULL, 0) == 1) 2, insert_params, NULL, NULL, 0) == 1)
@ -1227,9 +1227,10 @@ usage(const char *progname)
fprintf(stderr, "%s tests libpq's pipeline mode.\n\n", progname); fprintf(stderr, "%s tests libpq's pipeline mode.\n\n", progname);
fprintf(stderr, "Usage:\n"); fprintf(stderr, "Usage:\n");
fprintf(stderr, " %s [OPTION] tests\n", progname); fprintf(stderr, " %s [OPTION] tests\n", progname);
fprintf(stderr, " %s [OPTION] TESTNAME [CONNINFO [NUMBER_OF_ROWS]\n", progname); fprintf(stderr, " %s [OPTION] TESTNAME [CONNINFO]\n", progname);
fprintf(stderr, "\nOptions:\n"); fprintf(stderr, "\nOptions:\n");
fprintf(stderr, " -t TRACEFILE generate a libpq trace to TRACEFILE\n"); fprintf(stderr, " -t TRACEFILE generate a libpq trace to TRACEFILE\n");
fprintf(stderr, " -r NUMROWS use NUMROWS as the test size\n");
} }
static void static void
@ -1256,19 +1257,29 @@ main(int argc, char **argv)
PGresult *res; PGresult *res;
int c; int c;
while ((c = getopt(argc, argv, "t:")) != -1) while ((c = getopt(argc, argv, "t:r:")) != -1)
{ {
switch (c) switch (c)
{ {
case 't': /* trace file */ case 't': /* trace file */
tracefile = pg_strdup(optarg); tracefile = pg_strdup(optarg);
break; break;
case 'r': /* numrows */
errno = 0;
numrows = strtol(optarg, NULL, 10);
if (errno != 0 || numrows <= 0)
{
fprintf(stderr, "couldn't parse \"%s\" as a positive integer\n",
optarg);
exit(1);
}
break;
} }
} }
if (optind < argc) if (optind < argc)
{ {
testname = argv[optind]; testname = pg_strdup(argv[optind]);
optind++; optind++;
} }
else else
@ -1285,18 +1296,7 @@ main(int argc, char **argv)
if (optind < argc) if (optind < argc)
{ {
conninfo = argv[optind]; conninfo = pg_strdup(argv[optind]);
optind++;
}
if (optind < argc)
{
errno = 0;
numrows = strtol(argv[optind], NULL, 10);
if (errno != 0 || numrows <= 0)
{
fprintf(stderr, "couldn't parse \"%s\" as a positive integer\n", argv[optind]);
exit(1);
}
optind++; optind++;
} }

5
src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl
View File

@ -22,7 +22,7 @@ mkdir "$TestLib::tmp_check/traces";
for my $testname (@tests) for my $testname (@tests)
{ {
my @extraargs = (); my @extraargs = ('-r', $numrows);
my $cmptrace = grep(/^$testname$/, my $cmptrace = grep(/^$testname$/,
qw(simple_pipeline multi_pipelines prepared singlerow qw(simple_pipeline multi_pipelines prepared singlerow
pipeline_abort transaction disallowed_in_pipeline)) > 0; pipeline_abort transaction disallowed_in_pipeline)) > 0;
@ -38,8 +38,7 @@ for my $testname (@tests)
$node->command_ok( $node->command_ok(
[ [
'libpq_pipeline', @extraargs, 'libpq_pipeline', @extraargs,
$testname, $node->connstr('postgres'), $testname, $node->connstr('postgres')
$numrows
], ],
"libpq_pipeline $testname"); "libpq_pipeline $testname");