Merge commit 'ee861bc6cf7ccec4a056443488e7b0860b8b0606' as 'external/unarr'

external/unarr/test/CMakeLists.txt

@@ -0,0 +1,81 @@
+# project (unarr-test C)
+
+include(ProcessorCount)
+ProcessorCount(N)
+
+if(BUILD_FUZZER)
+  add_executable(fuzzer fuzzer.c)
+  set_target_properties(fuzzer PROPERTIES LINK_FLAGS "${sanitize_opts}")
+  target_link_libraries(fuzzer unarr)
+
+  file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/corpus)
+  file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/corpus/fuzzed)
+
+  add_test(NAME fuzzer_test
+           COMMAND fuzzer ${CMAKE_CURRENT_SOURCE_DIR}/corpus/fuzzed
+                   ${CMAKE_CURRENT_SOURCE_DIR}/corpus -jobs=${N})
+endif()
+
+if(BUILD_INTEGRATION_TESTS)
+  add_executable(unarr-test main.c)
+  target_link_libraries(unarr-test unarr)
+
+  function(run_test file)
+    add_test(NAME ${file} COMMAND unarr-test
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/corpus/${file})
+    set_tests_properties(
+      ${file}
+      PROPERTIES ENVIRONMENT
+                 "PATH=${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE};$ENV{PATH}")
+  endfunction(run_test file)
+
+  # Rar
+  run_test(integration/lipsum_rar4_store.rar)
+  run_test(integration/lipsum_rar4_default.rar)
+  run_test(integration/lipsum_rar4_max.rar)
+  # Non-standard compression methods
+  run_test(integration/lipsum_rar4_ppmd.rar) # Text
+  run_test(integration/lipsum_rar4_delta.rar)
+  run_test(integration/silent_rar4_audio.rar)
+  # TODO bmp - RGB color (bmp?)
+
+  # Tar
+  run_test(integration/lipsum.tar)
+
+  # Zip
+  run_test(integration/lipsum_zip_copy.zip)
+  run_test(integration/lipsum_zip_default.zip)
+  run_test(integration/lipsum_zip_max.zip)
+  # Non-standard compression methods
+  if(BZIP2_FOUND)
+    run_test(integration/lipsum_zip_bzip2.zip)
+  endif()
+  run_test(integration/lipsum_zip_deflate64.zip)
+  run_test(integration/lipsum_zip_lzma1.zip)
+  run_test(integration/lipsum_zip_ppmd.zip)
+  if(LIBLZMA_FOUND)
+    run_test(integration/lipsum_zip_xz.zip)
+  endif()
+
+  # 7z
+  if(ENABLE_7Z)
+    run_test(integration/lipsum_7z_store.7z)
+    run_test(integration/lipsum_7z_default.7z)
+    run_test(integration/lipsum_7z_max.7z)
+    # Non-standard compression methods
+    run_test(integration/lipsum_7z_lzma1.7z)
+    run_test(integration/lipsum_7z_ppmd.7z)
+  endif()
+endif()
+
+if(BUILD_UNIT_TESTS)
+  find_package(cmocka CONFIG REQUIRED)
+  add_executable(crc32-test crc32-test.c)
+  if(TARGET cmocka::cmocka)
+    target_link_libraries(crc32-test PRIVATE cmocka::cmocka)
+  else()
+    target_include_directories(crc32-test PRIVATE ${CMOCKA_INCLUDE_DIR})
+    target_link_libraries(crc32-test PRIVATE ${CMOCKA_LIBRARY})
+  endif()
+  add_test(crc32 crc32-test)
+endif()

external/unarr/test/Makefile

@@ -0,0 +1,74 @@
+# GNU Makefile
+
+build ?= debug
+
+OUT := build/$(build)
+
+default: all
+
+# --- Configuration ---
+
+CFLAGS += -Wall -D_FILE_OFFSET_BITS=64
+LIBS += -lm
+
+ifeq "$(build)" "debug"
+CFLAGS += -pipe -g -DDEBUG
+else ifeq "$(build)" "profile"
+CFLAGS += -pipe -O3 -DNDEBUG -pg
+LDFLAGS += -pg
+else ifeq "$(build)" "release"
+CFLAGS += -pipe -O3 -DNDEBUG -fomit-frame-pointer
+else ifeq "$(build)" "coverage"
+CFLAGS += -pipe -g -DDEBUG -pg -fprofile-arcs -ftest-coverage
+LIBS += -lgcov
+else
+$(error unknown build setting: '$(build)')
+endif
+
+# --- Commands ---
+
+ifneq "$(verbose)" "yes"
+QUIET_AR = @ echo ' ' ' ' AR $@ ;
+QUIET_CC = @ echo ' ' ' ' CC $@ ;
+QUIET_LINK = @ echo ' ' ' ' LINK $@ ;
+endif
+
+CC_CMD = $(QUIET_CC) mkdir -p $(@D) ; $(CC) $(CFLAGS) -o $@ -c $<
+AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
+LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+# --- Third party libraries ---
+
+# TODO: build zlib, bzip2 and 7z when available
+
+# --- unarr files ---
+
+UNARR_OUT := $(OUT)/unarr
+
+UNARR_DIRS := .. ../common ../lzmasdk ../rar ../tar ../zip ../_7z
+UNARR_SRC := $(wildcard $(UNARR_DIRS:=/*.c))
+UNARR_OBJ := $(addprefix $(UNARR_OUT)/, $(addsuffix .o, $(basename $(UNARR_SRC))))
+
+$(UNARR_OUT)/%.o : %.c
+	$(CC_CMD)
+
+UNARR_LIB := $(OUT)/libunarr.a
+
+$(UNARR_LIB): $(UNARR_OBJ)
+	$(AR_CMD)
+
+UNARR_TEST := $(OUT)/unarr-test
+
+$(UNARR_TEST) : $(UNARR_OUT)/main.o $(UNARR_LIB)
+	$(LINK_CMD)
+
+# TODO: add header dependencies
+
+# --- Clean and Default ---
+
+all: $(UNARR_TEST)
+
+clean:
+	rm -rf build
+
+.PHONY: all clean

external/unarr/test/corpus/src/lorem_ipsum.txt

@@ -0,0 +1,15 @@
+Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi consequat. Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+-- 
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
+
+Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.
+
+Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.
+
+Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.
+
+At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.
+
+Consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. 

external/unarr/test/crc32-test.c

@@ -0,0 +1,48 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include "../common/crc32.c"
+
+static void crc32_9(void **state) {
+    assert_int_equal(0xCBF43926, ar_crc32(0, "123456789", 9));
+}
+
+static void crc32_8(void **state) {
+    assert_int_equal(0x9AE0DAAF, ar_crc32(0, "12345678", 8));
+}
+
+static void crc32_4(void **state) {
+    assert_int_equal(0x9BE3E0A3, ar_crc32(0, "1234", 4));
+}
+
+static void crc32_2(void **state) {
+    assert_int_equal(0x4F5344CD, ar_crc32(0, "12", 2));
+}
+
+static void crc32_1(void **state) {
+    assert_int_equal(0x83DCEFB7, ar_crc32(0, "1", 1));
+}
+
+static void crc32_1_0(void **state) {
+    assert_int_equal(0xD202EF8D, ar_crc32(0, "\0", 1));
+}
+
+static void crc32_1_FF(void **state) {
+    assert_int_equal(0xFF000000, ar_crc32(0, "\xFF", 1));
+}
+
+int main(void) {
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(crc32_9),
+        cmocka_unit_test(crc32_8),
+        cmocka_unit_test(crc32_4),
+        cmocka_unit_test(crc32_2),
+        cmocka_unit_test(crc32_1),
+        cmocka_unit_test(crc32_1_0),
+        cmocka_unit_test(crc32_1_FF)
+    };
+
+    return cmocka_run_group_tests(tests, NULL, NULL);
+}

external/unarr/test/fuzzer.c

@@ -0,0 +1,65 @@
+#include "unarr.h"
+#include <stdio.h>
+
+ar_archive *ar_open_any_archive(ar_stream *stream) {
+  ar_archive *ar = ar_open_zip_archive(stream, false);
+  if (!ar)
+    ar = ar_open_zip_archive(stream, true);
+  if (!ar)
+    ar = ar_open_rar_archive(stream);
+  if (!ar)
+    ar = ar_open_7z_archive(stream);
+  if (!ar)
+    ar = ar_open_tar_archive(stream);
+  return ar;
+}
+
+void read_test(ar_stream *stream) {
+
+  ar_archive *ar = ar_open_any_archive(stream);
+
+  if (!ar) {
+    return;
+  }
+
+  while (true) {
+
+    if (ar_at_eof(ar)) {
+      break;
+    }
+
+    bool ok = ar_parse_entry(ar);
+
+    if (!ok) {
+      break;
+    }
+
+    size_t size = ar_entry_get_size(ar);
+    while (size > 0) {
+      unsigned char buffer[1024];
+      size_t count = size < sizeof(buffer) ? size : sizeof(buffer);
+      if (!ar_entry_uncompress(ar, buffer, count))
+        break;
+      size -= count;
+    }
+  }
+
+  if (!ar_at_eof(ar)) {
+    printf("not reach eof\n");
+  }
+
+  ar_close_archive(ar);
+}
+
+int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
+
+  ar_stream *stream;
+
+  stream = ar_open_memory(Data, Size);
+
+  read_test(stream);
+
+  ar_close(stream);
+
+  return 0; // Non-zero return values are reserved for future use.
+}

external/unarr/test/main.c

@@ -0,0 +1,81 @@
+/* Copyright 2015 the unarr project authors (see AUTHORS file).
+   License: LGPLv3 */
+
+/* demonstration of most of the public unarr API:
+   parses and decompresses an archive into memory (integrity test) */
+
+#include "unarr.h"
+
+#include <stdio.h>
+#include <inttypes.h>
+#include <string.h>
+#if !defined(NDEBUG) && defined(_MSC_VER)
+#include <windows.h>
+#include <crtdbg.h>
+#endif
+
+ar_archive *ar_open_any_archive(ar_stream *stream, const char *fileext)
+{
+    ar_archive *ar = ar_open_rar_archive(stream);
+    if (!ar)
+        ar = ar_open_zip_archive(stream, fileext && (strcmp(fileext, ".xps") == 0 || strcmp(fileext, ".epub") == 0));
+    if (!ar)
+        ar = ar_open_7z_archive(stream);
+    if (!ar)
+        ar = ar_open_tar_archive(stream);
+    return ar;
+}
+
+#define FailIf(cond, msg, ...) if (cond) { fprintf(stderr, msg "\n", __VA_ARGS__); goto CleanUp; } error_step++
+
+int main(int argc, char *argv[])
+{
+    ar_stream *stream = NULL;
+    ar_archive *ar = NULL;
+    int entry_count = 1;
+    int entry_skips = 0;
+    int error_step = 1;
+
+#if !defined(NDEBUG) && defined(_MSC_VER)
+    if (!IsDebuggerPresent()) {
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+    }
+    _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+#endif
+
+    FailIf(argc != 2, "Syntax: %s <filename.ext>", argv[0]);
+
+    stream = ar_open_file(argv[1]);
+    FailIf(!stream, "Error: File \"%s\" not found!", argv[1]);
+
+    printf("Parsing \"%s\":\n", argv[1]);
+    ar = ar_open_any_archive(stream, strrchr(argv[1], '.'));
+    FailIf(!ar, "Error: No valid %s archive!", "RAR, ZIP, 7Z or TAR");
+
+    while (ar_parse_entry(ar)) {
+        size_t size = ar_entry_get_size(ar);
+        printf("%02d. %s (@%" PRIi64 ")\n", entry_count++, ar_entry_get_name(ar), ar_entry_get_offset(ar));
+        const char *raw_filename = ar_entry_get_raw_name(ar);
+        if (raw_filename)
+            printf("Raw filename %s \n", raw_filename);
+        while (size > 0) {
+            unsigned char buffer[1024];
+            size_t count = size < sizeof(buffer) ? size : sizeof(buffer);
+            if (!ar_entry_uncompress(ar, buffer, count))
+                break;
+            size -= count;
+        }
+        if (size > 0) {
+            fprintf(stderr, "Warning: Failed to uncompress... skipping\n");
+            entry_skips++;
+        }
+    }
+    FailIf(!ar_at_eof(ar), "Error: Failed to parse entry %d!", entry_count);
+    error_step = entry_skips > 0 ? 1000 + entry_skips : 0;
+
+CleanUp:
+    ar_close_archive(ar);
+    ar_close(stream);
+    return error_step;
+}