Check number of fields in IDENTIFY_SYSTEM response

mhagander · mhagander · commit c14534957bb9 · 2012-01-20T13:57:02.000+01:00
Jaime Casanova
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -918,10 +918,10 @@ BaseBackup(void)
 				progname, PQerrorMessage(conn));
 		disconnect_and_exit(1);
 	}
-	if (PQntuples(res) != 1)
+	if (PQntuples(res) != 1 || PQnfields(res) != 3)
 	{
-		fprintf(stderr, _("%s: could not identify system, got %i rows\n"),
-				progname, PQntuples(res));
+		fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+				progname, PQntuples(res), PQnfields(res));
 		disconnect_and_exit(1);
 	}
 	sysidentifier = strdup(PQgetvalue(res, 0, 0));
@@ -1130,7 +1130,7 @@ BaseBackup(void)
 		{
 			fprintf(stderr, _("%s: could not parse xlog end position \"%s\"\n"),
 					progname, xlogend);
-			exit(1);
+			disconnect_and_exit(1);
 		}
 		InterlockedIncrement(&has_xlogendptr);
 
@@ -1162,6 +1162,7 @@ BaseBackup(void)
 	/*
 	 * End of copy data. Final result is already checked inside the loop.
 	 */
+	PQclear(res);
 	PQfinish(conn);
 
 	if (verbose)
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -235,10 +235,10 @@ StreamLog(void)
 				progname, PQerrorMessage(conn));
 		disconnect_and_exit(1);
 	}
-	if (PQntuples(res) != 1)
+	if (PQntuples(res) != 1 || PQnfields(res) != 3)
 	{
-		fprintf(stderr, _("%s: could not identify system, got %i rows\n"),
-				progname, PQntuples(res));
+		fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+				progname, PQntuples(res), PQnfields(res));
 		disconnect_and_exit(1);
 	}
 	timeline = atoi(PQgetvalue(res, 0, 1));
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -235,6 +235,13 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, char *sysi
 			PQclear(res);
 			return false;
 		}
+		if (PQnfields(res) != 3 || PQntuples(res) != 1)
+		{
+			fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+					progname, PQntuples(res), PQnfields(res));
+			PQclear(res);
+			return false;
+		}
 		if (strcmp(sysidentifier, PQgetvalue(res, 0, 0)) != 0)
 		{
 			fprintf(stderr, _("%s: system identifier does not match between base backup and streaming connection\n"), progname);

Original file line number	Diff line number	Diff line change
`@@ -918,10 +918,10 @@ BaseBackup(void)`
`918`	`918`	`progname, PQerrorMessage(conn));`
`919`	`919`	`disconnect_and_exit(1);`
`920`	`920`	`}`
`921`		`- if (PQntuples(res) != 1)`
	`921`	`+ if (PQntuples(res) != 1 \|\| PQnfields(res) != 3)`
`922`	`922`	`{`
`923`		`- fprintf(stderr, _("%s: could not identify system, got %i rows\n"),`
`924`		`- progname, PQntuples(res));`
	`923`	`+ fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),`
	`924`	`+ progname, PQntuples(res), PQnfields(res));`
`925`	`925`	`disconnect_and_exit(1);`
`926`	`926`	`}`
`927`	`927`	`sysidentifier = strdup(PQgetvalue(res, 0, 0));`
`@@ -1130,7 +1130,7 @@ BaseBackup(void)`
`1130`	`1130`	`{`
`1131`	`1131`	`fprintf(stderr, _("%s: could not parse xlog end position \"%s\"\n"),`
`1132`	`1132`	`progname, xlogend);`
`1133`		`- exit(1);`
	`1133`	`+ disconnect_and_exit(1);`
`1134`	`1134`	`}`
`1135`	`1135`	`InterlockedIncrement(&has_xlogendptr);`
`1136`	`1136`
`@@ -1162,6 +1162,7 @@ BaseBackup(void)`
`1162`	`1162`	`/*`
`1163`	`1163`	`* End of copy data. Final result is already checked inside the loop.`
`1164`	`1164`	`*/`
	`1165`	`+ PQclear(res);`
`1165`	`1166`	`PQfinish(conn);`
`1166`	`1167`
`1167`	`1168`	`if (verbose)`
Original file line number	Diff line number	Diff line change
`@@ -235,10 +235,10 @@ StreamLog(void)`
`235`	`235`	`progname, PQerrorMessage(conn));`
`236`	`236`	`disconnect_and_exit(1);`
`237`	`237`	`}`
`238`		`- if (PQntuples(res) != 1)`
	`238`	`+ if (PQntuples(res) != 1 \|\| PQnfields(res) != 3)`
`239`	`239`	`{`
`240`		`- fprintf(stderr, _("%s: could not identify system, got %i rows\n"),`
`241`		`- progname, PQntuples(res));`
	`240`	`+ fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),`
	`241`	`+ progname, PQntuples(res), PQnfields(res));`
`242`	`242`	`disconnect_and_exit(1);`
`243`	`243`	`}`
`244`	`244`	`timeline = atoi(PQgetvalue(res, 0, 1));`
Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,13 @@ ReceiveXlogStream(PGconn conn, XLogRecPtr startpos, uint32 timeline, char sysi`
`235`	`235`	`PQclear(res);`
`236`	`236`	`return false;`
`237`	`237`	`}`
	`238`	`+ if (PQnfields(res) != 3 \|\| PQntuples(res) != 1)`
	`239`	`+ {`
	`240`	`+ fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),`
	`241`	`+ progname, PQntuples(res), PQnfields(res));`
	`242`	`+ PQclear(res);`
	`243`	`+ return false;`
	`244`	`+ }`
`238`	`245`	`if (strcmp(sysidentifier, PQgetvalue(res, 0, 0)) != 0)`
`239`	`246`	`{`
`240`	`247`	`fprintf(stderr, _("%s: system identifier does not match between base backup and streaming connection\n"), progname);`