summaryrefslogtreecommitdiff
path: root/gst/jpegformat
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sf.net>2011-04-11 18:31:45 +0300
committerStefan Kost <ensonic@users.sf.net>2011-04-11 18:31:45 +0300
commitb84dd0a766ab4098e64ddc591c3c9031a313afe8 (patch)
tree03a3727d0c65a59082761426dfcb66bb512fc3c9 /gst/jpegformat
parent3a4a0c492e6277b6e1c32e5941650a6f6e0cf321 (diff)
downloadgstreamer-plugins-bad-b84dd0a766ab4098e64ddc591c3c9031a313afe8.tar.gz
jpegparse: subtract id-str size from the remaining read
Fixes a regression from the patches in bug #626618.
Diffstat (limited to 'gst/jpegformat')
-rw-r--r--gst/jpegformat/gstjpegparse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
index cb10ef88b..65e249c5e 100644
--- a/gst/jpegformat/gstjpegparse.c
+++ b/gst/jpegformat/gstjpegparse.c
@@ -623,6 +623,7 @@ gst_jpeg_parse_app1 (GstJpegParse * parse, GstByteReader * reader)
/* skip id + NUL + padding */
if (!gst_byte_reader_skip (reader, 6))
return FALSE;
+ size -= 6;
/* handle exif metadata */
if (!gst_byte_reader_get_data (reader, size, &data))
@@ -639,6 +640,7 @@ gst_jpeg_parse_app1 (GstJpegParse * parse, GstByteReader * reader)
/* skip the id + NUL */
if (!gst_byte_reader_skip (reader, 29))
return FALSE;
+ size -= 29;
/* handle xmp metadata */
if (!gst_byte_reader_get_data (reader, size, &data))