summaryrefslogtreecommitdiff
path: root/gst/jpegformat
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2010-07-08 17:58:16 +0200
committerThiago Santos <thiago.sousa.santos@collabora.co.uk>2010-07-08 14:27:45 -0300
commit1d57953496ab48178fcb5fa799e2d128362636a2 (patch)
tree7993ecf1ca242f0a4780ace83cd45adf09e1ac5e /gst/jpegformat
parentc15b64a515ffc533efccc890f2d7fba32ccc3b36 (diff)
downloadgstreamer-plugins-bad-1d57953496ab48178fcb5fa799e2d128362636a2.tar.gz
jpegparse: fix exif frame size
Skip the correct number of bytes when reading exif data Fixes #623854
Diffstat (limited to 'gst/jpegformat')
-rw-r--r--gst/jpegformat/gstjpegparse.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
index 22d6407e0..f3096b27c 100644
--- a/gst/jpegformat/gstjpegparse.c
+++ b/gst/jpegformat/gstjpegparse.c
@@ -557,7 +557,7 @@ gst_jpeg_parse_read_header (GstJpegParse * parse, GstBuffer * buffer)
if (!strcmp (id_str, "Exif")) {
const guint8 *exif_data = NULL;
- guint exif_size = size - 2;
+ guint exif_size = size - 2 - 6; /* 6 bytes for "Exif\0\0 id" */
GstTagList *tags;
GstBuffer *buf;
@@ -582,7 +582,7 @@ gst_jpeg_parse_read_header (GstJpegParse * parse, GstBuffer * buffer)
marker, id_str, size - 2);
} else if (!strcmp (id_str, "http://ns.adobe.com/xap/1.0/")) {
const guint8 *xmp_data = NULL;
- guint xmp_size = size - 2 - 29;
+ guint xmp_size = size - 2 - 29; /* 29 bytes for the id */
GstTagList *tags;
GstBuffer *buf;