diff options
| author | Andres Freund <andres@anarazel.de> | 2015-01-04 15:35:47 +0100 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2015-01-04 15:35:47 +0100 |
| commit | f0e2770956a8a6975dd70dd0bc3fdec073b50493 (patch) | |
| tree | 3ce5edde41a055efd25a33d4e9f6e4fd8e8d6def | |
| parent | d33f36f16e6a80b81afe55401917f8d23e924f83 (diff) | |
| download | postgresql-f0e2770956a8a6975dd70dd0bc3fdec073b50493.tar.gz postgresql-f0e2770956a8a6975dd70dd0bc3fdec073b50493.zip | |
Fix off-by-one in pg_xlogdump's fuzzy_open_file().
In the unlikely case of stdin (fd 0) being closed, the off-by-one
would lead to pg_xlogdump failing to open files.
Spotted by Coverity.
Backpatch to 9.3 where pg_xlogdump was introduced.
| -rw-r--r-- | contrib/pg_xlogdump/pg_xlogdump.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/pg_xlogdump/pg_xlogdump.c b/contrib/pg_xlogdump/pg_xlogdump.c index 24ca4fa8552..666c3409feb 100644 --- a/contrib/pg_xlogdump/pg_xlogdump.c +++ b/contrib/pg_xlogdump/pg_xlogdump.c @@ -151,7 +151,7 @@ fuzzy_open_file(const char *directory, const char *fname) fd = open(fname, O_RDONLY | PG_BINARY, 0); if (fd < 0 && errno != ENOENT) return -1; - else if (fd > 0) + else if (fd >= 0) return fd; /* XLOGDIR / fname */ @@ -160,7 +160,7 @@ fuzzy_open_file(const char *directory, const char *fname) fd = open(fpath, O_RDONLY | PG_BINARY, 0); if (fd < 0 && errno != ENOENT) return -1; - else if (fd > 0) + else if (fd >= 0) return fd; datadir = getenv("PGDATA"); @@ -172,7 +172,7 @@ fuzzy_open_file(const char *directory, const char *fname) fd = open(fpath, O_RDONLY | PG_BINARY, 0); if (fd < 0 && errno != ENOENT) return -1; - else if (fd > 0) + else if (fd >= 0) return fd; } } @@ -184,7 +184,7 @@ fuzzy_open_file(const char *directory, const char *fname) fd = open(fpath, O_RDONLY | PG_BINARY, 0); if (fd < 0 && errno != ENOENT) return -1; - else if (fd > 0) + else if (fd >= 0) return fd; /* directory / XLOGDIR / fname */ @@ -193,7 +193,7 @@ fuzzy_open_file(const char *directory, const char *fname) fd = open(fpath, O_RDONLY | PG_BINARY, 0); if (fd < 0 && errno != ENOENT) return -1; - else if (fd > 0) + else if (fd >= 0) return fd; } return -1; |