From patchwork Thu Dec 13 19:28:26 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: 11405 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 192FF44DEAF for ; Thu, 13 Dec 2018 21:34:21 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 413EA68A935; Thu, 13 Dec 2018 21:34:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A7BC689D8F for ; Thu, 13 Dec 2018 21:34:14 +0200 (EET) Received: by mail-pl1-f196.google.com with SMTP id b5so1523706plr.4 for ; Thu, 13 Dec 2018 11:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=UcdalFFFbq1HZ1L6JGHDDEjMfNqGRhk6aK9IIZffsZQ=; b=fb2/7qPk9L0DnjFgmfXHbWlrrLT8mMZnf9pQ3bKCkoT1JWc2+5UOW/MsoW7il49PRf ii+/Tv/j3rwVD0HPHAqvu3/HG7q/Gssd3MxLavl1TT0dj7miHv4TOPkw2Fk0exWN93En N8MeGgn2HS8pfRgtSjK8tkg3yOqPg9pJalU98= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=UcdalFFFbq1HZ1L6JGHDDEjMfNqGRhk6aK9IIZffsZQ=; b=E7QzYXs3P1fOx4A1no2p/m/YYGpjOuEWkL23FeqqVCFhloFfuh/efADMDCqx8deX6X R8OD93JdMbTpYpEc+RRy3FxeZmep66jQO95mE/018xE4gt31492vAxxE/sWFR2Wng3Pa QcdB5HA8wM1/naYVJKgK9XA/B2mtJ/JW79fNXInZ4SRRfK7qDKJ0ouPzKq6lEsr2/+FZ DbyjPS1vLToqdTLNrrV62MZaJZxA5iC4ykVykfQ3xZxRa4ndS8Ht9YB6klIo+9MJP6/A nmcp8JaRBkDOMwCoym2F1Pww5JkyrebzOc5in4E0+c6Kovhuzu0o+3yQU8vyRe09JRkg np/Q== X-Gm-Message-State: AA+aEWZvNKaDVv+80esgfAvbyERXWaix2m5cnkrv+nHIADDZnNXR8tYt q2ZN/zlytaP1knmcMcfzMN/7nhISRVT4AA== X-Google-Smtp-Source: AFSGD/Uw9LPCHDwxPpF3JgTMpny9JafXnLjuwqA18MX6fJIEqJEQT0mGNUi4UkqBYp7KXk88v4/Vyw== X-Received: by 2002:a17:902:6b83:: with SMTP id p3mr80798plk.118.1544729327341; Thu, 13 Dec 2018 11:28:47 -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 z9sm7648826pfd.99.2018.12.13.11.28.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Dec 2018 11:28:46 -0800 (PST) From: chcunningham To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Dec 2018 11:28:26 -0800 Message-Id: <20181213192826.92374-1-chcunningham@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: References: 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index f7de26a1d8..f06b9a787e 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -609,10 +609,13 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, taglen--; /* mimetype */ + memset(mimetype, 0, sizeof(mimetype)); 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; }