History

h264: check that execute_decode_slices() is not called too many times

Fixes invalid reads.

Anton Khirnov committed 12 years ago

Commit 9eef9eb1 parent bfd26b71 file · +6 −0Browse files

Unified · Split

libavcodec/h264.c+6−0
@@ -4495,6 +4495,12 @@ static int execute_decode_slices(H264Context *h, int context_count) · 4494 unmodified lines
4495 H264Context *hx;4495 H264Context *hx;
4496 int i;4496 int i;
4497 4497
4498 if (h->mb_y >= h->mb_height) {
4499 av_log(h->avctx, AV_LOG_ERROR,
4500 "Input contains more MB rows than the frame height.\n");
4501 return AVERROR_INVALIDDATA;
4502 }
4503
4498 if (h->avctx->hwaccel)4504 if (h->avctx->hwaccel)
4499 return 0;4505 return 0;
4500 if (context_count == 1) {4506 if (context_count == 1) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t