RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a' 

* commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a':
  avidec: Make sure a packet is large enough before reading its data

Conflicts:
	libavformat/avidec.c

See: 028cc42a16
Note: data!=NULL implies that the allocated array is at least FF_INPUT_BUFFER_PADDING_SIZE large
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-29 22:51:02 +02:00
parent b24f7cf950 8d07258bb6
commit 3a3ebc7c7d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avidec.c
View File

@ -905,7 +905,8 @@ fail:
static int read_gab2_sub(AVStream *st, AVPacket *pkt) static int read_gab2_sub(AVStream *st, AVPacket *pkt)
{ {
if (pkt->data && !strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data + 5) == 2) { if (pkt->size >= 7 &&
!strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data + 5) == 2) {
uint8_t desc[256]; uint8_t desc[256];
int score = AVPROBE_SCORE_EXTENSION, ret; int score = AVPROBE_SCORE_EXTENSION, ret;
AVIStream *ast = st->priv_data; AVIStream *ast = st->priv_data;