Fix pg_restore to guard against unexpected EOF while reading an archive file.

Per report and partial patch from Chad Wagner.

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index d01d614b9ec169ccaa9e5f1e2696dfc2f9ed41f3..428b75d2434082dd4d8efc99ff68a01439842bfc 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -1472,7 +1472,7 @@ ReadStr(ArchiveHandle *AH)
        int                     l;
 
        l = ReadInt(AH);
-       if (l == -1)
+       if (l < 0)
                buf = NULL;
        else
        {
@@ -1480,7 +1480,9 @@ ReadStr(ArchiveHandle *AH)
                if (!buf)
                        die_horribly(AH, modulename, "out of memory\n");
 
-               (*AH->ReadBufPtr) (AH, (void *) buf, l);
+               if ((*AH->ReadBufPtr) (AH, (void *) buf, l) != l)
+                       die_horribly(AH, modulename, "unexpected end of file\n");
+
                buf[l] = '\0';
        }
 
@@ -2675,8 +2677,8 @@ ReadHead(ArchiveHandle *AH)
        /* If we haven't already read the header... */
        if (!AH->readHeader)
        {
-
-               (*AH->ReadBufPtr) (AH, tmpMag, 5);
+               if ((*AH->ReadBufPtr) (AH, tmpMag, 5) != 5)
+                       die_horribly(AH, modulename, "unexpected end of file\n");
 
                if (strncmp(tmpMag, "PGDMP", 5) != 0)
                        die_horribly(AH, modulename, "did not find magic string in file header\n");

diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
index cc1732a3fcabf4484ab300963e6e5453f790d092..453109728773c4eb212fa1d52db02a06d9a80076 100644 (file)
--- a/src/bin/pg_dump/pg_backup_custom.c
+++ b/src/bin/pg_dump/pg_backup_custom.c
@@ -712,7 +712,7 @@ _WriteByte(ArchiveHandle *AH, const int i)
  *
  * Called by the archiver to read bytes & integers from the archive.
  * These routines are only used to read & write headers & TOC.
- *
+ * EOF should be treated as a fatal error.
  */
 static int
 _ReadByte(ArchiveHandle *AH)
@@ -720,9 +720,10 @@ _ReadByte(ArchiveHandle *AH)
        lclContext *ctx = (lclContext *) AH->formatData;
        int                     res;
 
-       res = fgetc(AH->FH);
-       if (res != EOF)
-               ctx->filePos += 1;
+       res = getc(AH->FH);
+       if (res == EOF)
+               die_horribly(AH, modulename, "unexpected end of file\n");
+       ctx->filePos += 1;
        return res;
 }
 

diff --git a/src/bin/pg_dump/pg_backup_files.c b/src/bin/pg_dump/pg_backup_files.c
index 57e4cb2b06bcf270ed90fec3c2d9c139f780c7a9..b7417b21f4c332cd59368e4106dfad8efabf50a2 100644 (file)
--- a/src/bin/pg_dump/pg_backup_files.c
+++ b/src/bin/pg_dump/pg_backup_files.c
@@ -395,9 +395,10 @@ _ReadByte(ArchiveHandle *AH)
        lclContext *ctx = (lclContext *) AH->formatData;
        int                     res;
 
-       res = fgetc(AH->FH);
-       if (res != EOF)
-               ctx->filePos += 1;
+       res = getc(AH->FH);
+       if (res == EOF)
+               die_horribly(AH, modulename, "unexpected end of file\n");
+       ctx->filePos += 1;
        return res;
 }
 

diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
index 5143fdcfc5b9e596b4fa885ad18b5ef5c7a2db07..4e9ab283184157c32b5d4dc7b18c9be7518d52d8 100644 (file)
--- a/src/bin/pg_dump/pg_backup_tar.c
+++ b/src/bin/pg_dump/pg_backup_tar.c
@@ -510,7 +510,7 @@ _tarReadRaw(ArchiveHandle *AH, void *buf, size_t len, TAR_MEMBER *th, FILE *fh)
                        used = avail;
 
                /* Copy, and adjust buffer pos */
-               memcpy(buf, AH->lookahead, used);
+               memcpy(buf, AH->lookahead + AH->lookaheadPos, used);
                AH->lookaheadPos += used;
 
                /* Adjust required length */
@@ -766,12 +766,13 @@ static int
 _ReadByte(ArchiveHandle *AH)
 {
        lclContext *ctx = (lclContext *) AH->formatData;
-       int                     res;
-       char            c = '\0';
+       size_t          res;
+       unsigned char c;
 
        res = tarRead(&c, 1, ctx->FH);
-       if (res != EOF)
-               ctx->filePos += res;
+       if (res != 1)
+               die_horribly(AH, modulename, "unexpected end of file\n");
+       ctx->filePos += 1;
        return c;
 }