Commit55d5ff8

committed

Fix detection of short tar files, broken by commit14ea893

Report by Noah Misch

1 parent2e54d88 commit55d5ff8Copy full SHA for 55d5ff8

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2034,10 +2034,13 @@ _discoverArchiveFormat(ArchiveHandle *AH)`
`2034`	`2034`	`exit_horribly(modulename,"input file appears to be a text format dump. Please use psql.\n");`
`2035`	`2035`	`}`
`2036`	`2036`
`2037`		`-if (AH->lookaheadLen!=512&&feof(fh))`
`2038`		`-exit_horribly(modulename,"input file does not appear to be a valid archive (too short?)\n");`
`2039`		`-else`
`2040`		`-READ_ERROR_EXIT(fh);`
	`2037`	`+if (AH->lookaheadLen!=512)`
	`2038`	`+{`
	`2039`	`+if (feof(fh))`
	`2040`	`+exit_horribly(modulename,"input file does not appear to be a valid archive (too short?)\n");`
	`2041`	`+else`
	`2042`	`+READ_ERROR_EXIT(fh);`
	`2043`	`+}`
`2041`	`2044`
`2042`	`2045`	`if (!isValidTarHeader(AH->lookahead))`
`2043`	`2046`	`exit_horribly(modulename,"input file does not appear to be a valid archive\n");`

Comments

(0)