ico: reject icon entries that are smaller than sizeof(BITMAPHEADER)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ico: reject icon entries that are smaller than sizeof(BITMAPHEADER)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
05125749 · Peter Ross · Michael Niedermayer · 90dbd081 · 05125749
Commit 05125749 authored Jan 12, 2012 by Peter Ross Committed by Michael Niedermayer Jan 12, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

icodec.c libavformat/icodec.c +2 -0

No files found.
--- a/libavformat/icodec.c
+++ b/libavformat/icodec.c
@@ -94,6 +94,8 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
            st->codec->height   = 0;
            break;
        case 40:
+            if (ico->images[i].size < 40)
+                return AVERROR_INVALIDDATA;
            st->codec->codec_id = CODEC_ID_BMP;
            if (!st->codec->width || !st->codec->height) {
                st->codec->width  = avio_rl32(pb);