Merge r1033 from trunk to fix Issue 25.

SVN-Revision: 1036

diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index 0f0e116e0e0079d86f31ba8ea09af223e6ebcf98..3496e0be0ea14752dcf197bb3361f294cc061c72 100644 (file)
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -990,8 +990,8 @@ read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset
                if (mtree->buff == NULL) {
                        archive_set_error(&a->archive, ENOMEM,
                            "Can't allocate memory");
+                       return (ARCHIVE_FATAL);
                }
-               return (ARCHIVE_FATAL);
        }
 
        *buff = mtree->buff;

diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c
index ad1b5ac6d5a1e9d3470fa7e283d2692bbdc69f4e..a88d0826c74e3ff046b233084b993e938742d1f2 100644 (file)
--- a/libarchive/test/test_read_format_mtree.c
+++ b/libarchive/test/test_read_format_mtree.c
@@ -28,7 +28,7 @@ __FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_mtree.c,v 1.4 2008/
 /* Single entry with a hardlink. */
 static unsigned char archive[] = {
        "#mtree\n"
-       "file type=file uid=18 mode=0123\n"
+       "file type=file uid=18 mode=0123 size=3\n"
        "dir type=dir\n"
        " file\\040with\\040space type=file uid=18\n"
        " ..\n"
@@ -49,8 +49,10 @@ static unsigned char archive[] = {
 
 DEFINE_TEST(test_read_format_mtree)
 {
+       char buff[16];
        struct archive_entry *ae;
        struct archive *a;
+       int fd;
 
        /*
         * An access error occurred on some platform when mtree
@@ -68,12 +70,23 @@ DEFINE_TEST(test_read_format_mtree)
            archive_read_support_format_all(a));
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
+
+       /*
+        * Read "file", whose data is available on disk.
+        */
+       fd = open("file", O_WRONLY | O_CREAT, 0777);
+       assert(fd >= 0);
+       assertEqualInt(3, write(fd, "hi\n", 3));
+       close(fd);
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE);
        assertEqualString(archive_entry_pathname(ae), "file");
        assertEqualInt(archive_entry_uid(ae), 18);
        assert(S_ISREG(archive_entry_mode(ae)));
        assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0123);
+       assertEqualInt(archive_entry_size(ae), 3);
+       assertEqualInt(3, archive_read_data(a, buff, 3));
+       assertEqualMem(buff, "hi\n", 3);
 
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
        assertEqualString(archive_entry_pathname(ae), "dir");