NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitf0e2770

committed

Fix off-by-one in pg_xlogdump's fuzzy_open_file().

In the unlikely case of stdin (fd 0) being closed, the off-by-onewould lead to pg_xlogdump failing to open files.Spotted by Coverity.Backpatch to 9.3 where pg_xlogdump was introduced.

1 parentd33f36f commitf0e2770Copy full SHA for f0e2770

File tree

1 file changed

-5

lines changed

contrib/pg_xlogdump
- pg_xlogdump.c

1 file changed

-5

lines changed

`‎contrib/pg_xlogdump/pg_xlogdump.c`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ fuzzy_open_file(const char directory, const char fname)`
`151`	`151`	`fd=open(fname,O_RDONLY \|PG_BINARY,0);`
`152`	`152`	`if (fd<0&&errno!=ENOENT)`
`153`	`153`	`return-1;`
`154`		`-elseif (fd>0)`
	`154`	`+elseif (fd >=0)`
`155`	`155`	`returnfd;`
`156`	`156`
`157`	`157`	`/* XLOGDIR / fname */`
`@@ -160,7 +160,7 @@ fuzzy_open_file(const char directory, const char fname)`
`160`	`160`	`fd=open(fpath,O_RDONLY \|PG_BINARY,0);`
`161`	`161`	`if (fd<0&&errno!=ENOENT)`
`162`	`162`	`return-1;`
`163`		`-elseif (fd>0)`
	`163`	`+elseif (fd >=0)`
`164`	`164`	`returnfd;`
`165`	`165`
`166`	`166`	`datadir=getenv("PGDATA");`
`@@ -172,7 +172,7 @@ fuzzy_open_file(const char directory, const char fname)`
`172`	`172`	`fd=open(fpath,O_RDONLY \|PG_BINARY,0);`
`173`	`173`	`if (fd<0&&errno!=ENOENT)`
`174`	`174`	`return-1;`
`175`		`-elseif (fd>0)`
	`175`	`+elseif (fd >=0)`
`176`	`176`	`returnfd;`
`177`	`177`	`}`
`178`	`178`	`}`
`@@ -184,7 +184,7 @@ fuzzy_open_file(const char directory, const char fname)`
`184`	`184`	`fd=open(fpath,O_RDONLY \|PG_BINARY,0);`
`185`	`185`	`if (fd<0&&errno!=ENOENT)`
`186`	`186`	`return-1;`
`187`		`-elseif (fd>0)`
	`187`	`+elseif (fd >=0)`
`188`	`188`	`returnfd;`
`189`	`189`
`190`	`190`	`/* directory / XLOGDIR / fname */`
`@@ -193,7 +193,7 @@ fuzzy_open_file(const char directory, const char fname)`
`193`	`193`	`fd=open(fpath,O_RDONLY \|PG_BINARY,0);`
`194`	`194`	`if (fd<0&&errno!=ENOENT)`
`195`	`195`	`return-1;`
`196`		`-elseif (fd>0)`
	`196`	`+elseif (fd >=0)`
`197`	`197`	`returnfd;`
`198`	`198`	`}`
`199`	`199`	`return-1;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf0e2770

File tree

1 file changed

1 file changed

`‎contrib/pg_xlogdump/pg_xlogdump.c`

0 commit comments