From patchwork Tue Oct 29 13:42:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Wadman X-Patchwork-Id: 16014 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DDEDC449798 for ; Tue, 29 Oct 2019 15:48:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4A8168B0AB; Tue, 29 Oct 2019 15:48:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1895E68B08D for ; Tue, 29 Oct 2019 15:48:52 +0200 (EET) Received: by mail-lj1-f195.google.com with SMTP id q64so15308243ljb.12 for ; Tue, 29 Oct 2019 06:48:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=5djN6L675HhVYkjGcfw1W75JfYWTXIEpZMOSnPydgvI=; b=dZN8tk0CJoZxyuhUOUPzDriXR2/n22c0YhCzazdfspFN2xuJbDh4aBq354C8PFNiup HRotI+MinBXBuLwiX3HWkcnbayhfOEgLYadtugrUnp3bfGIvaUemZieMFHXhwsIu3d5P +6exlhve+TxgAztjppj2Pko9tYZ9kkYZpoW66sxjRn8bk1DJ31pVgNPLJiQLuNlbGVF5 LKx1P9KLH5/kX40GdmcFAVbs2ON1mAlTE0a4YpKVnCcWAId2l7ReRgccG33sd9UCP15m O4+L0afDhebe1SyxNw9sw69l2BAUuCj0r7c7bLJTk7kWiWfS59TqWizlyH8+ARh3FMuW VYew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=5djN6L675HhVYkjGcfw1W75JfYWTXIEpZMOSnPydgvI=; b=PlC/tcq2LeurV9qb7+hYxx0c15FeQaBAcMKFOCpwdsC02LQL+Udq/KpkSf/Yfp7KQu g6HQqbQCq5k5GDhpvOa0AcB0i62qN7mOi7XjGEiULz1lIs4w/0kSppOTErXZnLGAg0d3 KpfZTOUJ0kSkO3i097bhqVev6kSErntP2YnLSFEA+e8oYJ3ibm2rwpbs1Cjh8ds4+RH/ AzsJxRHHDTcuEHQjXJL58dFC7h9eGlUhWLfgqRiQXFm1eF/E80HYbAaUBvfGf5VFP225 s/qvjq+iFD5EAB4gbKQBb6keW79IlPnFyjNLDisItajik+oLY5+7I0J7dm7bicbf3IP+ tz5w== X-Gm-Message-State: APjAAAXtVyrcoZFsowVMTnNa5VfGtwSK5Af2z3jPmRxs/g3krVIpPT+O 6VTYrtDpbBV9+JeT0OHRyM9peNbKqMamohd13J8bQWTEQa3fsQ== X-Google-Smtp-Source: APXvYqwzCUQLg4mxLQu2/MLYojq6kMVWh2s4nGITJzoBGlCLeufFwJvWa5vULvhgoeR/JRkt3r3rhGjLzYSDwCENTvo= X-Received: by 2002:a2e:b044:: with SMTP id d4mr2825040ljl.102.1572356578664; Tue, 29 Oct 2019 06:42:58 -0700 (PDT) MIME-Version: 1.0 From: Mattias Wadman Date: Tue, 29 Oct 2019 14:42:47 +0100 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH V2] libavformat/flacenc: reject too big picture blocks X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" A too big picture will case the muxer to write a truncated block size (uint24) causing the output file to be corrupt. How to reproduce: Write a file with truncated block size: ffmpeg -y -f lavfi -i sine -f lavfi -i color=red:size=2400x2400 -map 0:a:0 -map 1:v:0 -c:v:0 bmp -disposition:1 attached_pic -t 1 test.flac Try to decode: ffmpeg -i test.flac test.wav Signed-off-by: Mattias Wadman --- libavformat/flacenc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) return 0; @@ -140,8 +140,14 @@ static int flac_write_picture(struct AVFormatContext *s, AVPacket *pkt) desc = e->value; desclen = strlen(desc); + blocklen = 4 + 4 + mimelen + 4 + desclen + 4 + 4 + 4 + 4 + 4 + pkt->size; + if (blocklen >= 1<<24) { + av_log(s, AV_LOG_ERROR, "Picture block too big %d >= %d\n", blocklen, 1<<24); + return AVERROR(EINVAL); + } + avio_w8(pb, 0x06); - avio_wb24(pb, 4 + 4 + mimelen + 4 + desclen + 4 + 4 + 4 + 4 + 4 + pkt->size); + avio_wb24(pb, blocklen); avio_wb32(pb, type); diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 93cc79bbe0..7b51c11404 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -93,7 +93,7 @@ static int flac_write_picture(struct AVFormatContext *s, AVPacket *pkt) AVDictionaryEntry *e; const char *mimetype = NULL, *desc = ""; const AVStream *st = s->streams[pkt->stream_index]; - int i, mimelen, desclen, type = 0; + int i, mimelen, desclen, type = 0, blocklen; if (!pkt->data)