diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-10 23:30:09 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-10 23:30:09 +0000 |
| commit | 73d1887acf72fd7cdd2e7d53d530df2b21d89fb0 (patch) | |
| tree | 8521cd68c900fce791d37e52321528bdece3bb0e /media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch | |
| parent | New release: 0.12.0 (diff) | |
| download | gentoo-2-73d1887acf72fd7cdd2e7d53d530df2b21d89fb0.tar.gz gentoo-2-73d1887acf72fd7cdd2e7d53d530df2b21d89fb0.tar.bz2 gentoo-2-73d1887acf72fd7cdd2e7d53d530df2b21d89fb0.zip | |
Revision bumps for security bug #84076. Stable amd64, sparc, x86.
(Portage version: 2.0.51.19)
Diffstat (limited to 'media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch')
| -rw-r--r-- | media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch b/media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch new file mode 100644 index 000000000000..0a1e73fa51a9 --- /dev/null +++ b/media-libs/libexif/files/libexif-0.6-CAN-2005-0664.patch @@ -0,0 +1,30 @@ +--- libexif-0.6.9/libexif/exif-data.c~ 2005-03-03 22:54:52.333049248 +0100 ++++ libexif-0.6.9/libexif/exif-data.c 2005-03-03 22:50:57.117807400 +0100 +@@ -640,7 +640,7 @@ + #endif + + /* Byte order (offset 6, length 2) */ +- if (ds < 12) ++ if (ds < 14) + return; + if (!memcmp (d + 6, "II", 2)) + data->priv->order = EXIF_BYTE_ORDER_INTEL; +@@ -659,12 +659,18 @@ + printf ("IFD 0 at %i.\n", (int) offset); + #endif + ++ if (ds < 6 + 4 + offset) ++ return; ++ + /* Parse the actual exif data (offset 14) */ + exif_data_load_data_content (data, data->ifd[EXIF_IFD_0], d + 6, + ds - 6, offset); + + /* IFD 1 offset */ + n = exif_get_short (d + 6 + offset, data->priv->order); ++ if (ds < 6 + offset + 2 + 12 * n + 4) ++ return; ++ + offset = exif_get_long (d + 6 + offset + 2 + 12 * n, data->priv->order); + if (offset) { + #ifdef DEBUG |