Issue 314: A tar archive containing only a single 'g' record

should be treated as a valid empty tar archive.
(Such archives are generated by 'git archive' from an empty
repository.)

http://thread.gmane.org/gmane.comp.version-control.git/220485
http://code.google.com/p/libarchive/issues/detail?id=314

diff --git a/Makefile.am b/Makefile.am
index 6c156807f48f750881ac8677aacd2a6a1fbf7a56..9521adf96c4049f22a3a64f7f1eb7b4cd2b1bbed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -415,6 +415,7 @@ libarchive_test_SOURCES=                                    \
        libarchive/test/test_read_format_rar.c                  \
        libarchive/test/test_read_format_raw.c                  \
        libarchive/test/test_read_format_tar.c                  \
+       libarchive/test/test_read_format_tar_empty_pax.c        \
        libarchive/test/test_read_format_tar_empty_filename.c   \
        libarchive/test/test_read_format_tar_filename.c         \
        libarchive/test/test_read_format_tbz.c                  \
@@ -668,6 +669,7 @@ libarchive_test_EXTRA_DIST=\
        libarchive/test/test_read_format_rar_windows.rar.uu             \
        libarchive/test/test_read_format_raw.data.Z.uu                  \
        libarchive/test/test_read_format_raw.data.uu                    \
+       libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu         \
        libarchive/test/test_read_format_tar_empty_filename.tar.uu      \
        libarchive/test/test_read_format_tar_filename_koi8r.tar.Z.uu    \
        libarchive/test/test_read_format_ustar_filename_cp866.tar.Z.uu  \

diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index e9523cb687c8224c9c7a1360863be32bc0baebc0..1f33feeed73ac423d49c96157ce1c23e7b45552b 100644 (file)
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -683,6 +683,8 @@ tar_read_header(struct archive_read *a, struct tar *tar,
                a->archive.archive_format = ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE;
                a->archive.archive_format_name = "POSIX pax interchange format";
                err = header_pax_global(a, tar, entry, h, unconsumed);
+               if (err == ARCHIVE_EOF)
+                       return (err);
                break;
        case 'K': /* Long link name (GNU tar, others) */
                err = header_longlink(a, tar, entry, h, unconsumed);

diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
index d74206d8933076fb88798f9f8b4779fbf9e868b0..dadea4c6917afa69ecebb5cb894745378f34dd9a 100644 (file)
--- a/libarchive/test/CMakeLists.txt
+++ b/libarchive/test/CMakeLists.txt
@@ -129,6 +129,7 @@ IF(ENABLE_TEST)
     test_read_format_rar.c
     test_read_format_raw.c
     test_read_format_tar.c
+    test_read_format_tar_empty_pax.c
     test_read_format_tar_empty_filename.c
     test_read_format_tar_filename.c
     test_read_format_tbz.c

diff --git a/libarchive/test/test_read_format_tar_empty_pax.c b/libarchive/test/test_read_format_tar_empty_pax.c
new file mode 100644 (file)
index 0000000..c6b5741
--- /dev/null
+++ b/libarchive/test/test_read_format_tar_empty_pax.c
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2013 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "test.h"
+__FBSDID("$FreeBSD$");
+
+/*
+ * A "usual" empty tar archive contains only zero bytes
+ * and gets handled by the 'empty' format, not by the 'tar'
+ * format.  But there are other kinds of empty tar archives
+ * that are true tar archives and handled as such.
+ */
+DEFINE_TEST(test_read_format_tar_empty_pax)
+{
+       /*
+        * An archive that only contains a PAX 'g' record
+        * and no real files.  (Git will generate these when
+        * archiving an empty project.)
+        */
+       struct archive_entry *ae;
+       struct archive *a;
+       const char *refname = "test_read_format_tar_empty_pax.tar.Z";
+
+       extract_reference_file(refname);
+       assert((a = archive_read_new()) != NULL);
+       assertEqualInt(ARCHIVE_OK, archive_read_support_filter_all(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a));
+       assertEqualIntA(a, ARCHIVE_OK,
+           archive_read_open_filename(a, refname, 10240));
+       assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae));
+       assertEqualInt(ARCHIVE_FILTER_COMPRESS, archive_filter_code(a, 0));
+       assertEqualInt(ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE, archive_format(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}

diff --git a/libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu b/libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu
new file mode 100644 (file)
index 0000000..2557b3f
--- /dev/null
+++ b/libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu
@@ -0,0 +1,10 @@
+begin 644 test_read_format_tar_empty.tar.Z
+M'YV0<,+@^7*&S1LQ8=A\05,F#)DR<@!(G$BQHL6+&#-JW,BQ(HR/,&R(!`"R
+M),F2'T^B_&B#!H`8,F+,B$%C1@V9,D[2K`&C!H`S'8,*'4JTZ,4Z<^B$B?A1
+MSILW=(QF=`I5*L:5,%2:M,JUJ]>O8,'6D`%BS)LV;<JXH=.#3)BW-W#D,!-F
+MS`T8,F;`$",#1YB8-G+$B#%&AA@R,<C0"(,#1@X:.<K$4!"VLN7+F#-KWLRY
+ML^?/H$.+'DVZM.G3J%.K7LVZM>O7L&/+GDV[MNW;N'/KWLV[M^_?P(,+'TZ\
+MN/'CR),K7\Z\N?/GT*-+GTZ]NO7KV+-KW\Z]N_?OX,.+'T^^O/GSZ-.K7\^^
+?O?OW\./+GT^_OOW[^//KW\^_O___``8HX(`$%FC@4```
+`
+end