From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Thu, 20 Sep 2012 05:14:28 +0000 (+0900)
Subject: Do not write absolute paths to mtree archives.
X-Git-Tag: v3.1.0~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee859ca8c09475471fce28cccb63ce2f4ec0fcbb;p=thirdparty%2Flibarchive.git

Do not write absolute paths to mtree archives.
---

diff --git a/Makefile.am b/Makefile.am
index ca932b6e4..c90e08e70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -427,6 +427,7 @@ libarchive_test_SOURCES=					\
 	libarchive/test/test_write_format_mtree.c		\
 	libarchive/test/test_write_format_mtree_fflags.c	\
 	libarchive/test/test_write_format_mtree_no_separator.c	\
+	libarchive/test/test_write_format_mtree_absolute_path.c	\
 	libarchive/test/test_write_format_pax.c			\
 	libarchive/test/test_write_format_shar_empty.c		\
 	libarchive/test/test_write_format_tar.c			\
diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 4d13c72c6..dee7c689e 100644
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -897,6 +897,9 @@ write_entry(struct archive_write *a, struct mtree_entry *me)
 	    strcmp(me->pathname, ".") != 0) {
 		archive_strcat(str, "./");
 	}
+	/* mtree reader does not accept an absolute path. */
+	else if (me->pathname[0] == '/')
+		archive_strappend_char(str, '.');
 	mtree_quote(str, me->pathname);
 	keys = get_keys(mtree, me);
 	if ((keys & F_NLINK) != 0 &&
diff --git a/libarchive/test/test_write_format_mtree_absolute_path.c b/libarchive/test/test_write_format_mtree_absolute_path.c
new file mode 100644
index 000000000..e3972f1f1
--- /dev/null
+++ b/libarchive/test/test_write_format_mtree_absolute_path.c
@@ -0,0 +1,99 @@
+/*-
+ * Copyright (c) 2012 Michihiro NAKAJIMA
+ * 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
+ *    in this position and unchanged.
+ * 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$");
+
+static char buff[4096];
+
+DEFINE_TEST(test_write_format_mtree_absolute_path)
+{
+	struct archive_entry *ae;
+	struct archive* a;
+	size_t used;
+
+	/* Create a mtree format archive. */
+	assert((a = archive_write_new()) != NULL);
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_mtree(a));
+	assertEqualIntA(a, ARCHIVE_OK,
+	    archive_write_open_memory(a, buff, sizeof(buff)-1, &used));
+
+	/* Write "." file.  */
+	assert((ae = archive_entry_new()) != NULL);
+	archive_entry_copy_pathname(ae, ".");
+	archive_entry_set_mode(ae, AE_IFDIR | 0755);
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+	archive_entry_free(ae);
+
+	/* Write "/file" file.  */
+	assert((ae = archive_entry_new()) != NULL);
+	archive_entry_copy_pathname(ae, "/file");
+	archive_entry_set_size(ae, 0);
+	archive_entry_set_mode(ae, AE_IFREG | 0644);
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+	archive_entry_free(ae);
+
+	/* Write "/dir" directory.  */
+	assert((ae = archive_entry_new()) != NULL);
+	archive_entry_copy_pathname(ae, "/dir");
+	archive_entry_set_mode(ae, AE_IFDIR | 0755);
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae));
+	archive_entry_free(ae);
+
+	assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a));
+        assertEqualInt(ARCHIVE_OK, archive_write_free(a));
+
+	/*
+	 * Read the data and check it.
+	 */
+	assert((a = archive_read_new()) != NULL);
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used));
+
+	/* Read "." file. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	failure("The path should be just \".\"");
+	assertEqualString(archive_entry_pathname(ae), ".");
+	assertEqualInt(archive_entry_mode(ae), AE_IFDIR | 0755);
+
+	/* Read "/file" file. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	failure("The path should have \"./\" prefix");
+	assertEqualString(archive_entry_pathname(ae), "./file");
+	assertEqualInt(archive_entry_size(ae), 0);
+	assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0644);
+
+	/* Read "/dir" file. */
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+	failure("The path should have \"./\" prefix");
+	assertEqualString(archive_entry_pathname(ae), "./dir");
+	assertEqualInt(archive_entry_mode(ae), AE_IFDIR | 0755);
+
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+	assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+