Fix libpq example programs

petere · petere · commit 7bdea6263543 · 2018-07-01T14:06:40.000+02:00
When these programs call pg_catalog.set_config, they need to check for PGRES_TUPLES_OK instead of PGRES_COMMAND_OK. Fix for 5770172. Reported-by: Ideriha, Takeshi <ideriha.takeshi@jp.fujitsu.com>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
@@ -8440,7 +8440,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);
@@ -8610,7 +8610,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
@@ -936,7 +936,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -936,7 +936,7 @@ main(int argc, char **argv)`
`936`	`936`	`/* Set always-secure search path, so malicous users can't take control. */`
`937`	`937`	`res = PQexec(conn,`
`938`	`938`	`"SELECT pg_catalog.set_config('search_path', '', false)");`
`939`		`- if (PQresultStatus(res) != PGRES_COMMAND_OK)`
	`939`	`+ if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`940`	`940`	`{`
`941`	`941`	`fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));`
`942`	`942`	`PQclear(res);`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ main(int argc, char **argv)`
`51`	`51`	`/* Set always-secure search path, so malicous users can't take control. */`
`52`	`52`	`res = PQexec(conn,`
`53`	`53`	`"SELECT pg_catalog.set_config('search_path', '', false)");`
`54`		`- if (PQresultStatus(res) != PGRES_COMMAND_OK)`
	`54`	`+ if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`55`	`55`	`{`
`56`	`56`	`fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));`
`57`	`57`	`PQclear(res);`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ main(int argc, char **argv)`
`80`	`80`	`/* Set always-secure search path, so malicous users can't take control. */`
`81`	`81`	`res = PQexec(conn,`
`82`	`82`	`"SELECT pg_catalog.set_config('search_path', '', false)");`
`83`		`- if (PQresultStatus(res) != PGRES_COMMAND_OK)`
	`83`	`+ if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`84`	`84`	`{`
`85`	`85`	`fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));`
`86`	`86`	`PQclear(res);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ check_prepare_conn(PGconn conn, const char dbName)`
`37`	`37`	`/* Set always-secure search path, so malicous users can't take control. */`
`38`	`38`	`res = PQexec(conn,`
`39`	`39`	`"SELECT pg_catalog.set_config('search_path', '', false)");`
`40`		`- if (PQresultStatus(res) != PGRES_COMMAND_OK)`
	`40`	`+ if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`41`	`41`	`{`
`42`	`42`	`fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));`
`43`	`43`	`PQclear(res);`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ main(int argc, char **argv)`
`235`	`235`	`/* Set always-secure search path, so malicous users can't take control. */`
`236`	`236`	`res = PQexec(conn,`
`237`	`237`	`"SELECT pg_catalog.set_config('search_path', '', false)");`
`238`		`- if (PQresultStatus(res) != PGRES_COMMAND_OK)`
	`238`	`+ if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`239`	`239`	`{`
`240`	`240`	`fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));`
`241`	`241`	`PQclear(res);`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ main(int argc, char **argv)`
`259`	`259`	`/* Set always-secure search path, so malicous users can't take control. */`
`260`	`260`	`res = PQexec(conn,`
`261`	`261`	`"SELECT pg_catalog.set_config('search_path', '', false)");`
`262`		`- if (PQresultStatus(res) != PGRES_COMMAND_OK)`
	`262`	`+ if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`263`	`263`	`{`
`264`	`264`	`fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));`
`265`	`265`	`PQclear(res);`