From badcd3da81ac447d71c8d6d91bfaa3f49cd5ed6b Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 24 Jul 2014 11:58:11 +0200 Subject: [PATCH] Print a warning instead of requesting a sample for an invalid exif tag. Fixes ticket #3792. Reviewed-by: Thilo Borgmann --- libavcodec/exif.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/exif.c b/libavcodec/exif.c index a980da2a7b..fa30f0573f 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -47,6 +47,11 @@ static int exif_add_metadata(AVCodecContext *avctx, int count, int type, AVDictionary **metadata) { switch(type) { + case 0: + av_log(avctx, AV_LOG_WARNING, + "Invalid TIFF tag type 0 found for %s with size %d\n", + name, count); + return 0; case TIFF_DOUBLE : return ff_tadd_doubles_metadata(count, name, sep, gb, le, metadata); case TIFF_SSHORT : return ff_tadd_shorts_metadata(count, name, sep, gb, le, 1, metadata); case TIFF_SHORT : return ff_tadd_shorts_metadata(count, name, sep, gb, le, 0, metadata);