Skip to content
Snippets Groups Projects
Commit 4b1b47e8 authored by Paul B Mahol's avatar Paul B Mahol
Browse files

avcodec/scpr: stop checking for overread twice

parent 5161f7bc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
libavcodec/scpr.c
+ 2
− 2
View file @ 4b1b47e8
...@@ -136,7 +136,7 @@ static int decode(GetByteContext *gb, RangeCoder *rc, unsigned cumFreq, unsigned ...@@ -136,7 +136,7 @@ static int decode(GetByteContext *gb, RangeCoder *rc, unsigned cumFreq, unsigned
rc->range *= freq; rc->range *= freq;
while (rc->range < TOP && bytestream2_get_bytes_left(gb) > 0) { while (rc->range < TOP && bytestream2_get_bytes_left(gb) > 0) {
unsigned byte = bytestream2_get_byte(gb); unsigned byte = bytestream2_get_byteu(gb);
rc->code = (rc->code << 8) | byte; rc->code = (rc->code << 8) | byte;
rc->range <<= 8; rc->range <<= 8;
} }
...@@ -172,7 +172,7 @@ static int decode0(GetByteContext *gb, RangeCoder *rc, unsigned cumFreq, unsigne ...@@ -172,7 +172,7 @@ static int decode0(GetByteContext *gb, RangeCoder *rc, unsigned cumFreq, unsigne
rc->range = rc->range * (uint64_t)(freq + cumFreq) / total_freq - (t + 1); rc->range = rc->range * (uint64_t)(freq + cumFreq) / total_freq - (t + 1);
while (rc->range < TOP && bytestream2_get_bytes_left(gb) > 0) { while (rc->range < TOP && bytestream2_get_bytes_left(gb) > 0) {
unsigned byte = bytestream2_get_byte(gb); unsigned byte = bytestream2_get_byteu(gb);
rc->code = (rc->code << 8) | byte; rc->code = (rc->code << 8) | byte;
rc->code1 <<= 8; rc->code1 <<= 8;
rc->range <<= 8; rc->range <<= 8;
......
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