har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/xface: Add asserts to limit nb_words from becoming too large

Browse Source 
Approved-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-16 18:09:16 +01:00
parent 93a5a16f13
commit 211200e0c0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/xface.c
View File

@ -24,6 +24,8 @@
* X-Face common data and utilities definition. * X-Face common data and utilities definition.
*/ */
#include "libavutil/avassert.h"
#include "xface.h" #include "xface.h"
void ff_big_add(BigInt *b, uint8_t a) void ff_big_add(BigInt *b, uint8_t a)
@ -43,6 +45,7 @@ void ff_big_add(BigInt *b, uint8_t a)
c >>= XFACE_BITSPERWORD; c >>= XFACE_BITSPERWORD;
} }
if (i == b->nb_words && c) { if (i == b->nb_words && c) {
av_assert0(b->nb_words < XFACE_MAX_WORDS);
b->nb_words++; b->nb_words++;
*w = c & XFACE_WORDMASK; *w = c & XFACE_WORDMASK;
} }
@ -98,6 +101,7 @@ void ff_big_mul(BigInt *b, uint8_t a)
return; return;
if (a == 0) { if (a == 0) {
/* treat this as a == WORDCARRY and just shift everything left a WORD */ /* treat this as a == WORDCARRY and just shift everything left a WORD */
av_assert0(b->nb_words < XFACE_MAX_WORDS);
i = b->nb_words++; i = b->nb_words++;
w = b->words + i; w = b->words + i;
while (i--) { while (i--) {
@ -116,6 +120,7 @@ void ff_big_mul(BigInt *b, uint8_t a)
c >>= XFACE_BITSPERWORD; c >>= XFACE_BITSPERWORD;
} }
if (c) { if (c) {
av_assert0(b->nb_words < XFACE_MAX_WORDS);
b->nb_words++; b->nb_words++;
*w = c & XFACE_WORDMASK; *w = c & XFACE_WORDMASK;
} }