NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit835a487

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 parent2d8411a commit835a487Copy full SHA for 835a487

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
`@@ -152,7 +152,7 @@ fuzzy_open_file(const char directory, const char fname)`
`152`	`152`	`fd=open(fname,O_RDONLY \|PG_BINARY,0);`
`153`	`153`	`if (fd<0&&errno!=ENOENT)`
`154`	`154`	`return-1;`
`155`		`-elseif (fd>0)`
	`155`	`+elseif (fd >=0)`
`156`	`156`	`returnfd;`
`157`	`157`
`158`	`158`	`/* XLOGDIR / fname */`
`@@ -161,7 +161,7 @@ fuzzy_open_file(const char directory, const char fname)`
`161`	`161`	`fd=open(fpath,O_RDONLY \|PG_BINARY,0);`
`162`	`162`	`if (fd<0&&errno!=ENOENT)`
`163`	`163`	`return-1;`
`164`		`-elseif (fd>0)`
	`164`	`+elseif (fd >=0)`
`165`	`165`	`returnfd;`
`166`	`166`
`167`	`167`	`datadir=getenv("PGDATA");`
`@@ -173,7 +173,7 @@ fuzzy_open_file(const char directory, const char fname)`
`173`	`173`	`fd=open(fpath,O_RDONLY \|PG_BINARY,0);`
`174`	`174`	`if (fd<0&&errno!=ENOENT)`
`175`	`175`	`return-1;`
`176`		`-elseif (fd>0)`
	`176`	`+elseif (fd >=0)`
`177`	`177`	`returnfd;`
`178`	`178`	`}`
`179`	`179`	`}`
`@@ -185,7 +185,7 @@ fuzzy_open_file(const char directory, const char fname)`
`185`	`185`	`fd=open(fpath,O_RDONLY \|PG_BINARY,0);`
`186`	`186`	`if (fd<0&&errno!=ENOENT)`
`187`	`187`	`return-1;`
`188`		`-elseif (fd>0)`
	`188`	`+elseif (fd >=0)`
`189`	`189`	`returnfd;`
`190`	`190`
`191`	`191`	`/* directory / XLOGDIR / fname */`
`@@ -194,7 +194,7 @@ fuzzy_open_file(const char directory, const char fname)`
`194`	`194`	`fd=open(fpath,O_RDONLY \|PG_BINARY,0);`
`195`	`195`	`if (fd<0&&errno!=ENOENT)`
`196`	`196`	`return-1;`
`197`		`-elseif (fd>0)`
	`197`	`+elseif (fd >=0)`
`198`	`198`	`returnfd;`
`199`	`199`	`}`
`200`	`200`	`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!

Commit835a487

File tree

1 file changed

1 file changed

`‎contrib/pg_xlogdump/pg_xlogdump.c`

0 commit comments