Skip to content

F
ffmpeg.wasm-core
Commit f8a81755 authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

jvdec: remove redundant check 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 1bc9e4c5
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/jvdec.c
View file @ f8a81755
...@@ -142,7 +142,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -142,7 +142,7 @@ static int decode_frame(AVCodecContext *avctx,
buf += 5; buf += 5;
if (video_size) { if (video_size) {
if (video_size < 0 || video_size > avpkt->size) { if (video_size < 0 || video_size > avpkt->size - 5) {
av_log(avctx, AV_LOG_ERROR, "video size %d invalid\n", video_size); av_log(avctx, AV_LOG_ERROR, "video size %d invalid\n", video_size);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
...@@ -153,7 +153,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -153,7 +153,7 @@ static int decode_frame(AVCodecContext *avctx,
if (video_type == 0 || video_type == 1) { if (video_type == 0 || video_type == 1) {
GetBitContext gb; GetBitContext gb;
init_get_bits(&gb, buf, 8 * FFMIN(video_size, buf_end - buf)); init_get_bits(&gb, buf, 8 * video_size);
for (j = 0; j < avctx->height; j += 8) for (j = 0; j < avctx->height; j += 8)
for (i = 0; i < avctx->width; i += 8) for (i = 0; i < avctx->width; i += 8)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment