2003-07-30 Lutz Mueller <lutz@users.sourceforge.net>

	* libexif/exif-data.c: Patch by Torgeir Hansen <torgeir@trenger.ro>
	  to prevent endless loops.

diff --git a/ChangeLog b/ChangeLog
index 7fff711..598beb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-07-30  Lutz Mueller <lutz@users.sourceforge.net>
 
+       * libexif/exif-data.c: Patch by Torgeir Hansen <torgeir@trenger.ro>
+         to prevent endless loops.
+
+2003-07-30  Lutz Mueller <lutz@users.sourceforge.net>
+
        * libexif/exif-entry.c: Don't crash if entries are totally insane.
 
 2003-07-20  Lutz Mueller <lutz@users.sourceforge.net>

diff --git a/libexif/exif-data.c b/libexif/exif-data.c
index bcef253..995dacf 100644 (file)
--- a/libexif/exif-data.c
+++ b/libexif/exif-data.c
@@ -660,7 +660,7 @@ exif_data_new_from_file (const char *path)
        loader = exif_loader_new ();
        while (1) {
                size = fread (data, 1, 1024, f);
-               if (size < 0) break;
+               if (size <= 0) break;
                if (!exif_loader_write (loader, data, size)) break;
        }
        fclose (f);