Commitc145349

committed

Check number of fields in IDENTIFY_SYSTEM response

Jaime Casanova

1 parent356fddf commitc145349Copy full SHA for c145349

File tree

+15

-7

lines changed

+15

-7

lines changed

Lines changed: 5 additions & 4 deletions

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)`

Lines changed: 3 additions & 3 deletions

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));`

Lines changed: 7 additions & 0 deletions

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);`

Comments

(0)