From: Jonathan Dieter <jdieter@gmail.com>
Date: Mon, 8 Oct 2018 13:19:45 +0000 (+0100)
Subject: New test to check whether decompressing unknown optional flags works
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~92
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=25d5da158dd80311b5b39ba3ca468f67920356c9;p=zchunk.git

New test to check whether decompressing unknown optional flags works

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/test/meson.build b/test/meson.build
index 6bc40d8..421ae01 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -2,6 +2,7 @@ util_sources = []
 subdir('lib')
 incdir = include_directories(['lib', '../src/lib', '../include'])
 empty = executable('empty', ['empty.c'] + util_sources, include_directories: incdir, dependencies: [zstd_dep, openssl_dep])
+optflag = executable('optflag', ['optflag.c'] + util_sources, include_directories: incdir, dependencies: [zstd_dep, openssl_dep])
 shacheck = find_program('shacheck.sh')
 file_path = join_paths(meson.source_root(), 'test/files')
 
@@ -46,6 +47,14 @@ test(
     ]
 )
 
+test(
+    'check opening file with optional flags',
+    optflag,
+    args: [
+        join_paths(file_path, 'empty.optflags.zck')
+    ]
+)
+
 test(
     'check verbosity in unzck',
     unzck,
diff --git a/test/optflag.c b/test/optflag.c
new file mode 100644
index 0000000..ea6b3a9
--- /dev/null
+++ b/test/optflag.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2018 Jonathan Dieter <jdieter@gmail.com>
+ *
+ * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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 <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <zck.h>
+#include "zck_private.h"
+#include "util.h"
+
+int main (int argc, char *argv[]) {
+    zck_set_log_level(ZCK_LOG_DEBUG);
+    char data[1000] = {0};
+
+    /* Open zchunk file and verify that zck->has_optional_flags is set */
+    int in = open(argv[1], O_RDONLY);
+    if(in < 0) {
+        perror("Unable to open empty.zck for reading");
+        exit(1);
+    }
+
+    zckCtx *zck = zck_create();
+    if(zck == NULL)
+        exit(1);
+    if(!zck_init_read(zck, in)) {
+        printf("%s", zck_get_error(zck));
+        exit(1);
+    }
+    if(!zck->has_optional_flags) {
+        printf("zck->has_optional_flags should be set, but isn't");
+        exit(1);
+    }
+    memset(data, 0, 1000);
+    ssize_t len = zck_read(zck, data, 1000);
+    if(len > 0) {
+        printf("%li bytes read, but file should be empty\n", (long)len);
+        exit(1);
+    }
+    if(!zck_close(zck))
+        exit(1);
+
+    zck_free(&zck);
+    return 0;
+}