From fce2cfbdcfbdcf40907f5965f08eb3231385f65b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 19 Oct 2013 17:52:47 +0200 Subject: [PATCH] avcodec/utils: add some saftey checks to add_metadata_from_side_data() This fixes potential overreads with crafted files. Found-by: wm4 Signed-off-by: Michael Niedermayer (cherry picked from commit 838f461b0716393a1b5c70efd03de1e8bc197380) Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index d77b5ec661..5b1b96d9b8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1899,10 +1899,17 @@ static int add_metadata_from_side_data(AVCodecContext *avctx, AVFrame *frame) if (!side_metadata) goto end; end = side_metadata + size; + if (size && end[-1]) + return AVERROR_INVALIDDATA; while (side_metadata < end) { const uint8_t *key = side_metadata; 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) break; side_metadata = val + strlen(val) + 1;