From: Hans U. N. <gp...@n-...> - 2005-03-09 13:37:18
|
Jan Patera <pa...@us...> writes: > Update of /cvsroot/libexif/libexif/libexif > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1237/libexif > > Modified Files: > exif-data.c=20 > Log Message: > 2005-03-09 Jan Patera <pa...@us...> > * exif_data.c: Final fix of Ubuntu Security Notice USN-91-1 > https://bugzilla.ubuntulinux.org/show_bug.cgi?id=3D7152 > Most of the problem (including most important parts) was > already fixed in the past. > > > Index: exif-data.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v > retrieving revision 1.62 > retrieving revision 1.63 > diff -u -d -r1.62 -r1.63 > --- exif-data.c 16 Dec 2004 21:00:26 -0000 1.62 > +++ exif-data.c 9 Mar 2005 06:02:45 -0000 1.63 > @@ -696,7 +696,7 @@ > "Found EXIF header."); >=20=20 > /* Byte order (offset 6, length 2) */ > - if (ds < 12) > + if (ds < 14) > return; > if (!memcmp (d + 6, "II", 2)) > data->priv->order =3D EXIF_BYTE_ORDER_INTEL; > @@ -714,7 +714,7 @@ > exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData",=20 > "IFD 0 at %i.", (int) offset); >=20=20 > - /* Parse the actual exif data (offset 14) */ > + /* Parse the actual exif data (usually offset 14 from start) */ > exif_data_load_data_content (data, data->ifd[EXIF_IFD_0], d + 6, > ds - 6, offset); Does this fix everything now? :-) Tell me if/when we should do another release. (Yes, a test case would be nice.) Gru=C3=9F, Uli |