libarchive 2.0

  * libarchive_test program exercises many of the core features
  * Refactored old "read_extract" into new "archive_write_disk", which
    uses archive_write methods to put entries onto disk.  In particular,
    you can now use archive_write_disk to create objects on disk
    without having an archive available.
  * Pushed some security checks from bsdtar down into libarchive, where
    they can be better optimized.
  * Rearchitected the logic for creating objects on disk to reduce
    the number of system calls.  Several common cases now use a
    minimum number of system calls.
  * Virtualized some internal interfaces to provide a clearer separation
    of read and write handling and make it simpler to override key
    methods.
  * New "empty" format reader.
  * Corrected return types (this ABI breakage required the "2.0" version bump)
  * Many bug fixes.

1 files changed, 75 insertions, 0 deletions

diff --git a/lib/libarchive/test/test_write_open_memory.c b/lib/libarchive/test/test_write_open_memory.c
new file mode 100644
index 0000000..dd4171e
--- /dev/null
+++ b/lib/libarchive/test/test_write_open_memory.c
@@ -0,0 +1,75 @@
+/*-
+ * Copyright (c) 2003-2007 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$");
+
+/* Try to force archive_write_open_memory.c to write past the end of an array. */
+static unsigned char buff[16384];
+
+DEFINE_TEST(test_write_open_memory)
+{
+	int i;
+	struct archive *a;
+	struct archive_entry *ae;
+	const char *name="/tmp/test";
+
+	/* Create a simple archive_entry. */
+	assert((ae = archive_entry_new()) != NULL);
+	archive_entry_set_pathname(ae, name);
+	archive_entry_set_mode(ae, S_IFREG);
+	assert(0 == strcmp(archive_entry_pathname(ae), name));
+
+	/* Try writing with different buffer sizes. */
+	/* Make sure that we get failure on too-small buffers, success on
+	 * large enough ones. */
+	for (i = 100; i < 1600; i++) {
+		size_t s;
+		size_t blocksize = 94;
+		assert((a = archive_write_new()) != NULL);
+		assertA(0 == archive_write_set_format_ustar(a));
+		assertA(0 == archive_write_set_bytes_in_last_block(a, 1));
+		assertA(0 == archive_write_set_bytes_per_block(a, blocksize));
+		buff[i] = 0xAE;
+		assertA(0 == archive_write_open_memory(a, buff, i, &s));
+		/* If buffer is smaller than a tar header, this should fail. */
+		if (i < (511/blocksize)*blocksize)
+			assertA(ARCHIVE_FATAL == archive_write_header(a,ae));
+		else
+			assertA(0 == archive_write_header(a, ae));
+		/* If buffer is smaller than a tar header plus 1024 byte
+		 * end-of-archive marker, then this should fail. */
+		if (i < 1536)
+			assertA(ARCHIVE_FATAL == archive_write_close(a));
+		else
+			assertA(0 == archive_write_close(a));
+#if ARCHIVE_API_VERSION > 1
+		assert(0 == archive_write_finish(a));
+#else
+		archive_write_finish(a);
+#endif
+		assert(buff[i] == 0xAE);
+		assert(s <= i);
+	}
+}