2002-02-17 Lutz Müller <lutz@users.sourceforge.net>

        Patch from Fredrik <fredrik@krixor.xy.org>:

        * libexif/exif-data.c: Better checks for size.

diff --git a/ChangeLog b/ChangeLog
index 3f44808..566fc23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-17  Lutz Müller <lutz@users.sourceforge.net>
+
+       Patch from Fredrik <fredrik@krixor.xy.org>:
+
+       * libexif/exif-data.c: Better checks for size.
+
 2002-02-13  Lutz Müller <lutz@users.sourceforge.net>
 
        * libexif/configure.in: Introduce proper versionning.

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index 4673885..cad1454 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -392,8 +392,8 @@ exif_data_load_data (ExifData *data, const unsigned char *d, unsigned int size)
        if (size < 6) {
 #ifdef DEBUG
                printf ("Size too small.\n");
-               return;
 #endif
+               return;
        }
        if (!memcmp (d, ExifHeader, 6)) {
 #ifdef DEBUG
@@ -460,14 +460,14 @@ exif_data_load_data (ExifData *data, const unsigned char *d, unsigned int size)
        if (size < 6) {
 #ifdef DEBUG
                printf ("Size too small.\n");
-               return;
 #endif
+               return;
        }
        if (memcmp (d, ExifHeader, 6)) {
 #ifdef DEBUG
                printf ("EXIF header not found.\n");
-               return;
 #endif
+               return;
        }
 
 #ifdef DEBUG