gthumb r2497 - in branches/gthumb-2-10: . libgthumb

[mjc svn gnome org]

Author: mjc
Date: Thu Jan 22 18:43:30 2009
New Revision: 2497
URL: http://svn.gnome.org/viewvc/gthumb?rev=2497&view=rev

Log:
2009-01-22  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/gth-exif-utils.c: (gth_minimal_exif_tag_action):
        Fix crasher bug in exif tag reading, caused by malformed tiff
        headers. Ubuntu bug http://bugs.launchpad.net/bugs/316017.



Modified:
   branches/gthumb-2-10/ChangeLog
   branches/gthumb-2-10/libgthumb/gth-exif-utils.c

Modified: branches/gthumb-2-10/libgthumb/gth-exif-utils.c
==============================================================================
--- branches/gthumb-2-10/libgthumb/gth-exif-utils.c	(original)
+++ branches/gthumb-2-10/libgthumb/gth-exif-utils.c	Thu Jan 22 18:43:30 2009
@@ -466,6 +466,9 @@
         offset  = de_get32(&buf[i] + 4, endian);
  	i       = i + offset;
  
+	// Make sure the address is within bounds
+	if (i >= readsize) return PATCH_EXIF_NO_TIFF;
+
         // Start out with IFD0 (and add more IFDs while we go)
  	IFD_OFFSET_PUSH(i);
  	IFD_NAME_PUSH("IFD0");