mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
avcodec/h263: Fix global-buffer-overflow with noout flag2 set
h263_get_motion_length() forgot to take an absolute value;
as a consequence, a negative index was used to access an array.
This leads to potential crashes, but mostly it just accesses what
is to the left of ff_mvtab (unless one uses ASAN), thereby defeating
the purpose of the AV_CODEC_FLAG2_NO_OUTPUT because the sizes of
the returned packets differ from the sizes the encoder would actually
have produced.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit 9207dc3b0d
)
This commit is contained in:
parent
de82f92b84
commit
f82aaea3ff
@ -100,15 +100,16 @@ void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code);
|
||||
|
||||
|
||||
static inline int h263_get_motion_length(int val, int f_code){
|
||||
int l, bit_size, code;
|
||||
int bit_size, code, sign;
|
||||
|
||||
if (val == 0) {
|
||||
return ff_mvtab[0][1];
|
||||
} else {
|
||||
bit_size = f_code - 1;
|
||||
/* modulo encoding */
|
||||
l= INT_BIT - 6 - bit_size;
|
||||
val = (val<<l)>>l;
|
||||
val = sign_extend(val, 6 + bit_size);
|
||||
sign = val >> 31;
|
||||
val = (val ^ sign) - sign; /* val = FFABS(val) */
|
||||
val--;
|
||||
code = (val >> bit_size) + 1;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user