From d5ad0e19d16b66f18b5be87d30dacc8204c238ce Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 1 Jul 2018 14:06:40 +0200 Subject: [PATCH] Fix libpq example programs When these programs call pg_catalog.set_config, they need to check for PGRES_TUPLES_OK instead of PGRES_COMMAND_OK. Fix for 5770172cb0c9df9e6ce27c507b449557e5b45124. Reported-by: Ideriha, Takeshi --- doc/src/sgml/libpq.sgml | 4 ++-- doc/src/sgml/lobj.sgml | 2 +- src/test/examples/testlibpq.c | 2 +- src/test/examples/testlibpq2.c | 2 +- src/test/examples/testlibpq4.c | 2 +- src/test/examples/testlo.c | 2 +- src/test/examples/testlo64.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index b19083ebce5..7586bd7cc2d 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -7977,7 +7977,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); @@ -8147,7 +8147,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml index 64868267c4e..818e59e32a3 100644 --- a/doc/src/sgml/lobj.sgml +++ b/doc/src/sgml/lobj.sgml @@ -902,7 +902,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c index 92a05e53093..d9c6c4587d4 100644 --- a/src/test/examples/testlibpq.c +++ b/src/test/examples/testlibpq.c @@ -51,7 +51,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c index 76787fe010b..62ecd68b55e 100644 --- a/src/test/examples/testlibpq2.c +++ b/src/test/examples/testlibpq2.c @@ -80,7 +80,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c index a20f6249b4e..6fcbdda2fa7 100644 --- a/src/test/examples/testlibpq4.c +++ b/src/test/examples/testlibpq4.c @@ -37,7 +37,7 @@ check_prepare_conn(PGconn *conn, const char *dbName) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c index 8a65f897cd7..cba115a3abf 100644 --- a/src/test/examples/testlo.c +++ b/src/test/examples/testlo.c @@ -235,7 +235,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res); diff --git a/src/test/examples/testlo64.c b/src/test/examples/testlo64.c index 5512107dfad..94a1d79a15d 100644 --- a/src/test/examples/testlo64.c +++ b/src/test/examples/testlo64.c @@ -259,7 +259,7 @@ main(int argc, char **argv) /* Set always-secure search path, so malicous users can't take control. */ res = PQexec(conn, "SELECT pg_catalog.set_config('search_path', '', false)"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) + if (PQresultStatus(res) != PGRES_TUPLES_OK) { fprintf(stderr, "SET failed: %s", PQerrorMessage(conn)); PQclear(res);