pg_dump: Replace can't-happen error with assertion

petere · petere · commit d51f704fd8cb · 2020-04-27T14:24:20.000+02:00
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
@@ -515,6 +515,8 @@ _tarReadRaw(ArchiveHandle *AH, void *buf, size_t len, TAR_MEMBER *th, FILE *fh)
 	size_t		used = 0;
 	size_t		res = 0;
 
+	Assert(th || fh);
+
 	avail = AH->lookaheadLen - AH->lookaheadPos;
 	if (avail > 0)
 	{
@@ -567,8 +569,6 @@ _tarReadRaw(ArchiveHandle *AH, void *buf, size_t len, TAR_MEMBER *th, FILE *fh)
 					READ_ERROR_EXIT(th->nFH);
 			}
 		}
-		else
-			fatal("internal error -- neither th nor fh specified in _tarReadRaw()");
 	}
 
 	ctx->tarFHpos += res + used;

Original file line number	Diff line number	Diff line change
`@@ -515,6 +515,8 @@ _tarReadRaw(ArchiveHandle AH, void buf, size_t len, TAR_MEMBER th, FILE fh)`
`515`	`515`	`size_t used = 0;`
`516`	`516`	`size_t res = 0;`
`517`	`517`
	`518`	`+ Assert(th \|\| fh);`
	`519`	`+`
`518`	`520`	`avail = AH->lookaheadLen - AH->lookaheadPos;`
`519`	`521`	`if (avail > 0)`
`520`	`522`	`{`
`@@ -567,8 +569,6 @@ _tarReadRaw(ArchiveHandle AH, void buf, size_t len, TAR_MEMBER th, FILE fh)`
`567`	`569`	`READ_ERROR_EXIT(th->nFH);`
`568`	`570`	`}`
`569`	`571`	`}`
`570`		`- else`
`571`		`- fatal("internal error -- neither th nor fh specified in _tarReadRaw()");`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`ctx->tarFHpos += res + used;`