generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/img2dec: allocate and clear padding area for probe correctly

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-04 03:40:53 +02:00
parent 7d179b126b
commit 726e253b00
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/img2dec.c
View File

@ -304,12 +304,21 @@ int ff_img_read_header(AVFormatContext *s1)
s->split_planes = str && !av_strcasecmp(str + 1, "y"); s->split_planes = str && !av_strcasecmp(str + 1, "y");
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
if (s1->pb) { if (s1->pb) {
uint8_t probe_buffer[AVPROBE_PADDING_SIZE] = {0}; int probe_buffer_size = 8;
uint8_t *probe_buffer = av_realloc(NULL, probe_buffer_size + AVPROBE_PADDING_SIZE);
AVInputFormat *fmt = NULL; AVInputFormat *fmt = NULL;
AVProbeData pd; AVProbeData pd;
int ret = avio_read(s1->pb, probe_buffer, 8); int ret;
if (ret < 8)
return AVERROR(EINVAL); if (!probe_buffer)
return AVERROR(ENOMEM);
probe_buffer_size = avio_read(s1->pb, probe_buffer, probe_buffer_size);
if (probe_buffer_size < 0) {
av_free(probe_buffer);
return probe_buffer_size;
}
memset(probe_buffer + probe_buffer_size, 0, AVPROBE_PADDING_SIZE);
avio_seek(s1->pb, -8, SEEK_CUR); avio_seek(s1->pb, -8, SEEK_CUR);
pd.buf = probe_buffer; pd.buf = probe_buffer;
@ -327,6 +336,7 @@ int ff_img_read_header(AVFormatContext *s1)
break; break;
} }
} }
av_free(probe_buffer);
} }
if (st->codec->codec_id == AV_CODEC_ID_NONE) if (st->codec->codec_id == AV_CODEC_ID_NONE)
st->codec->codec_id = ff_guess_image2_codec(s->path); st->codec->codec_id = ff_guess_image2_codec(s->path);