Skip to content
Snippets Groups Projects
Commit 4e6413c6 authored by Reimar Döffinger's avatar Reimar Döffinger
Browse files

rtjpeg: check get_block return value for error.


This avoids crashes due to reading out-of-bounds.

Signed-off-by: default avatarReimar Döffinger <Reimar.Doeffinger@gmx.de>
parent fffa4530
No related branches found
No related tags found
No related merge requests found
...@@ -114,24 +114,25 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, ...@@ -114,24 +114,25 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
#define BLOCK(quant, dst, stride) do { \
int res = get_block(&gb, block, c->scan, quant); \
if (res < 0) \
return res; \
if (res > 0) \
c->dsp->idct_put(dst, stride, block); \
} while (0)
DCTELEM *block = c->block; DCTELEM *block = c->block;
if (get_block(&gb, block, c->scan, c->lquant) > 0) BLOCK(c->lquant, y1, f->linesize[0]);
c->dsp->idct_put(y1, f->linesize[0], block);
y1 += 8; y1 += 8;
if (get_block(&gb, block, c->scan, c->lquant) > 0) BLOCK(c->lquant, y1, f->linesize[0]);
c->dsp->idct_put(y1, f->linesize[0], block);
y1 += 8; y1 += 8;
if (get_block(&gb, block, c->scan, c->lquant) > 0) BLOCK(c->lquant, y2, f->linesize[0]);
c->dsp->idct_put(y2, f->linesize[0], block);
y2 += 8; y2 += 8;
if (get_block(&gb, block, c->scan, c->lquant) > 0) BLOCK(c->lquant, y2, f->linesize[0]);
c->dsp->idct_put(y2, f->linesize[0], block);
y2 += 8; y2 += 8;
if (get_block(&gb, block, c->scan, c->cquant) > 0) BLOCK(c->cquant, u, f->linesize[1]);
c->dsp->idct_put(u, f->linesize[1], block);
u += 8; u += 8;
if (get_block(&gb, block, c->scan, c->cquant) > 0) BLOCK(c->cquant, v, f->linesize[2]);
c->dsp->idct_put(v, f->linesize[2], block);
v += 8; v += 8;
} }
y1 += 2 * 8 * (f->linesize[0] - w); y1 += 2 * 8 * (f->linesize[0] - w);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment