virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

avcodec/utils: add some saftey checks to add_metadata_from_side_data()

Browse Source 
This fixes potential overreads with crafted files.

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-19 17:52:47 +02:00
parent 240fd8c96f
commit 838f461b07
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/utils.c
View File

@ -1952,10 +1952,17 @@ static int add_metadata_from_side_data(AVCodecContext *avctx, AVFrame *frame)
if (!side_metadata) if (!side_metadata)
goto end; goto end;
end = side_metadata + size; end = side_metadata + size;
if (size && end[-1])
return AVERROR_INVALIDDATA;
while (side_metadata < end) { while (side_metadata < end) {
const uint8_t *key = side_metadata; const uint8_t *key = side_metadata;
const uint8_t *val = side_metadata + strlen(key) + 1; const uint8_t *val = side_metadata + strlen(key) + 1;
int ret = av_dict_set(avpriv_frame_get_metadatap(frame), key, val, 0); int ret;
if (val >= end)
return AVERROR_INVALIDDATA;
ret = av_dict_set(avpriv_frame_get_metadatap(frame), key, val, 0);
if (ret < 0) if (ret < 0)
break; break;
side_metadata = val + strlen(val) + 1; side_metadata = val + strlen(val) + 1;