From patchwork Thu Dec 13 02:59:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chcunningham@chromium.org X-Patchwork-Id: 11397 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 234DB44E290 for ; Thu, 13 Dec 2018 04:59:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6AE0468A884; Thu, 13 Dec 2018 04:59:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72C7C68A664 for ; Thu, 13 Dec 2018 04:59:19 +0200 (EET) Received: by mail-pf1-f170.google.com with SMTP id q1so326842pfi.5 for ; Wed, 12 Dec 2018 18:59:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9MD0jYuWsSXNSD3BJ/PA5VmXvw3HYz8fMEh7xk/4nio=; b=hxzbonxynnm0hKZiUJth2wkwfqaFIeofuvNjvzjzhfHgZbPvqAHUYr5VV/c0P61qOg P+RRKAA273B8i/+9XnjdzaHIGlAiNY8GSVdtbuZCRgFcxiSa+a9G+czWtSvuOKwRNdiW bjZnBuuZiNSUR948KhjRUqiY27SUHa0yPcZtA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9MD0jYuWsSXNSD3BJ/PA5VmXvw3HYz8fMEh7xk/4nio=; b=KxfFu4TQvj+Z7fRZKpsccciyUMfXJgz+xlAVV46Z3Z4fjqZPmwxz49KPoJxhpdg3Sf 8clhkY5fUSYvjj7sf870//gzROXt1zehowENq0XASG+0EjjRQuScQxvSP5YCfxThhas0 GtJ7ufuCdHqd2BgOtmM5VlIuWfiBTnoQNLSfvm/rmSjCptjYHlaEqCo4r2xkHuPOJeZ8 qUOwJ9z3XjXGQtZYkty+cKtef3QY4KgzBCcwAjDIJ8wxJbH+3fIajxtiFQVJtlaCv26h aYnWjPMzFEtBzGVHDH1SiTguECJ8mW/sfAR1BeoeEVbHCDQq2rDvI1MRKJtClvwBmKKo hKsg== X-Gm-Message-State: AA+aEWa1iMmdbIA7fXCGvF35FyqkE5zxq3rguBKrTZhmvRHG+R8AH0hq ECzgb/FM0xEXnfhYfm73zdjF6nbcatQcrw== X-Google-Smtp-Source: AFSGD/Wxx2AxugafcrY/obuLF7fTFu8gDhT0DwyfMr2rwv0d3m+BRsyP16SgOCbi7XXtZZK0F2eNQw== X-Received: by 2002:a63:9d45:: with SMTP id i66mr341297pgd.98.1544669969822; Wed, 12 Dec 2018 18:59:29 -0800 (PST) Received: from chcunningham-linux.sea.corp.google.com ([2620:15c:38:200:74b:ad27:5acb:a21]) by smtp.gmail.com with ESMTPSA id y12sm483732pfk.70.2018.12.12.18.59.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 18:59:29 -0800 (PST) From: chcunningham To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Dec 2018 18:59:14 -0800 Message-Id: <20181213025914.206807-1-chcunningham@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/id3v2: fail read_apic on EOF reading mimetype 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" avio_read may return EOF, leaving the mimetype array unitialized. fail early when this occurs to avoid using the array in an unitialized state. --- libavformat/id3v2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index f7de26a1d8..7c4d1f8677 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -612,7 +612,9 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, if (isv34) { taglen -= avio_get_str(pb, taglen, mimetype, sizeof(mimetype)); } else { - avio_read(pb, mimetype, 3); + if (avio_read(pb, mimetype, 3) < 0) + goto fail; + mimetype[3] = 0; taglen -= 3; }