projects
/
platform
/
upstream
/
gst-plugins-good.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ab6667
)
jpegdec: Fix invalid memory access by first checking and then reading
author
David Hoyt
<dhoyt@llnl.gov>
Mon, 22 Feb 2010 19:55:29 +0000
(20:55 +0100)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Mon, 22 Feb 2010 19:55:29 +0000
(20:55 +0100)
Fixes bug #610483.
ext/jpeg/gstjpegdec.c
patch
|
blob
|
history
diff --git
a/ext/jpeg/gstjpegdec.c
b/ext/jpeg/gstjpegdec.c
index
91bca55
..
f90911c
100644
(file)
--- a/
ext/jpeg/gstjpegdec.c
+++ b/
ext/jpeg/gstjpegdec.c
@@
-486,10
+486,10
@@
gst_jpeg_dec_parse_image_data (GstJpegDec * dec)
GST_DEBUG ("0x%08" G_GINT64_MODIFIER "x: finding entropy segment length",
(gint64) (data - start - 1));
while (1) {
- if (d2[eseglen] == 0xff && d2[eseglen + 1] != 0x00)
- break;
if (d2 + eseglen >= end - 1)
return 0; /* need more data */
+ if (d2[eseglen] == 0xff && d2[eseglen + 1] != 0x00)
+ break;
++eseglen;
}
frame_len += eseglen;