projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3a4a0c4
)
jpegparse: subtract id-str size from the remaining read
author
Stefan Kost
<ensonic@users.sf.net>
Mon, 11 Apr 2011 15:31:45 +0000
(18:31 +0300)
committer
Stefan Kost
<ensonic@users.sf.net>
Mon, 11 Apr 2011 15:31:45 +0000
(18:31 +0300)
Fixes a regression from the patches in bug #626618.
gst/jpegformat/gstjpegparse.c
patch
|
blob
|
history
diff --git
a/gst/jpegformat/gstjpegparse.c
b/gst/jpegformat/gstjpegparse.c
index
cb10ef8
..
65e249c
100644
(file)
--- 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))