handle non-0 terminated value returns as failure

[platform/upstream/libexif.git] / test / test-fuzzer.c

diff --git a/test/test-fuzzer.c b/test/test-fuzzer.c
index 1ee7870..2af7288 100644 (file)
--- a/test/test-fuzzer.c
+++ b/test/test-fuzzer.c
@@ -4,7 +4,7 @@
  * \brief Completely parse all files given on the command line.
  *
  * Copyright (C) 2007 Hans Ulrich Niedermann <gp@n-dimensional.de>
- * Copyright 2002 Lutz M\uffffller <lutz@users.sourceforge.net>
+ * Copyright 2002 Lutz Mueller <lutz@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,17 +34,22 @@
 void content_foreach_func(ExifEntry *entry, void *callback_data);
 void content_foreach_func(ExifEntry *entry, void *UNUSED(callback_data))
 {
-  char buf[2000];
-  exif_entry_get_value(entry, buf, sizeof(buf));
-  printf("    Entry %p: %s (%s)\n"
-        "      Size, Comps: %d, %d\n"
-        "      Value: %s\n", 
-        entry,
-        exif_tag_get_name(entry->tag),
-        exif_format_get_name(entry->format),
-        entry->size,
-        (int)(entry->components),
-        exif_entry_get_value(entry, buf, sizeof(buf)));
+       char buf[2001];
+
+       /* ensure \0 */
+       buf[sizeof(buf)-1] = 0;
+       buf[sizeof(buf)-2] = 0;
+       exif_entry_get_value(entry, buf, sizeof(buf)-1);
+       printf("    Entry %p: %s (%s)\n"
+                "      Size, Comps: %d, %d\n"
+                "      Value: %s\n", 
+                entry,
+                exif_tag_get_name(entry->tag),
+                exif_format_get_name(entry->format),
+                entry->size,
+                (int)(entry->components),
+                exif_entry_get_value(entry, buf, sizeof(buf)-1));
+       if (buf[sizeof(buf)-2] != 0) abort();
 }
 
 
@@ -52,8 +57,8 @@ void content_foreach_func(ExifEntry *entry, void *UNUSED(callback_data))
 void data_foreach_func(ExifContent *content, void *callback_data);
 void data_foreach_func(ExifContent *content, void *callback_data)
 {
-  printf("  Content %p: ifd=%d\n", content, exif_content_get_ifd(content));
-  exif_content_foreach_entry(content, content_foreach_func, callback_data);
+       printf("  Content %p: ifd=%d\n", content, exif_content_get_ifd(content));
+       exif_content_foreach_entry(content, content_foreach_func, callback_data);
 }
 static int
 test_exif_data (ExifData *d)
@@ -76,6 +81,8 @@ test_exif_data (ExifData *d)
 
        c = exif_mnote_data_count (md);
        for (i = 0; i < c; i++) {
+               char *name = exif_mnote_data_get_name (md, i);
+               if (!name) break;
                fprintf (stdout, "Dumping entry number %i...\n", i);
                fprintf (stdout, "  Name: '%s'\n",
                                exif_mnote_data_get_name (md, i));
@@ -84,7 +91,7 @@ test_exif_data (ExifData *d)
                fprintf (stdout, "  Description: '%s'\n",
                                exif_mnote_data_get_description (md, i));
                p = exif_mnote_data_get_value (md, i, v, sizeof (v));
-               if (p) { fprintf (stdout, "  Value: '%s'\n", v); }
+               if (p) fprintf (stdout, "  Value: '%s'\n", v);
        }
 
        return 0;
@@ -96,10 +103,24 @@ test_exif_data (ExifData *d)
 static void test_parse(const char *filename, void *callback_data)
 {
        ExifData *d;
+       unsigned int buf_size;
+       unsigned char *buf;
 
        d = exif_data_new_from_file(filename);
        exif_data_foreach_content(d, data_foreach_func, callback_data);
        test_exif_data (d);
+
+       buf = NULL;
+       exif_data_save_data (d, &buf, &buf_size);
+       free (buf);
+
+       exif_data_set_byte_order(d, EXIF_BYTE_ORDER_INTEL);
+
+       buf = NULL;
+       exif_data_save_data (d, &buf, &buf_size);
+       free (buf);
+
+
        exif_data_unref(d);
 }