From patchwork Fri Dec 14 21:44:07 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: 11418 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 25AD844D508 for ; Fri, 14 Dec 2018 23:53:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47C1568AB35; Fri, 14 Dec 2018 23:53:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8110468AB1F for ; Fri, 14 Dec 2018 23:53:22 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id w6so3267730pgl.6 for ; Fri, 14 Dec 2018 13:53:22 -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=CfCOs2N9EJpjEZacVJdoufGi1+47cTMS/S4zLJNluMk=; b=Aly57QDPBU9yI4QJ20PjDpMsb7MVv8HWNDgD/0sP3rXL+gcWH8Ze9+qu165cglC3+q nOltYSM5tOswPk0cbPeYNU+LPoeEwMkrGHLQylfAfQSXAaqjcxp/AcJ6OU064c3OUwKV dUuwI9Fys2YIijwNdvvgelHLMmdzgI7XO4lSI= 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=CfCOs2N9EJpjEZacVJdoufGi1+47cTMS/S4zLJNluMk=; b=ThWyiDAsnKE/aaKU+yodVvi9QFovOodIxE8CYo4rxVeKcjtvUVRUfJI3FLUxD2y4HG 3L0xd3fZ0YpSMadLSGtN9aDeTBE0oR1ctOiWTPmMZXVDMYyEgqze1TF2lPxvKOh0wRM0 xt68y+j5RQBwMVqdl23/dqJGTMOoYNny86tItBzcHTTkoHH9Z05e+RDyCQsDRL1dfvlE MdhNdvu6SmlYG4ZXk7pFhxGO5wwtTwH9bGswvGN9UZgUVorbMqCWflJ1XC9Wx2Q2nvIU f9K8LUWA1wuntbTmk14OuFgIx2gnqQkXrN65dshcfjseQxf7EYN8zi/OzmCVDvsNpvlE KtWg== X-Gm-Message-State: AA+aEWZXnHBXYie1MYE36ERg6QbnycJxPSE0GjSi9+ZSuI/xVRQrD7x9 eDuUVaAIz3UercpV0M3YBTnLG0yCT2d4Yw== X-Google-Smtp-Source: AFSGD/UwnVJYsQC7TIov1nOPe7UohP/NUoO/6qyNJTfKx5zttkLMWsL0bk/GKJZXiTkHZvbRRFB4Cw== X-Received: by 2002:a63:6a05:: with SMTP id f5mr4132734pgc.72.1544823903303; Fri, 14 Dec 2018 13:45:03 -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 c13sm8045623pfo.121.2018.12.14.13.45.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 13:45:02 -0800 (PST) From: chcunningham To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Dec 2018 13:44:07 -0800 Message-Id: <20181214214407.58880-1-chcunningham@chromium.org> X-Mailer: git-send-email 2.20.0.405.gbc1bbc6f85-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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index f7de26a1d8..5fe055b591 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -590,7 +590,7 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, int isv34) { int enc, pic_type; - char mimetype[64]; + char mimetype[64] = {0}; const CodecMime *mime = ff_id3v2_mime_tags; enum AVCodecID id = AV_CODEC_ID_NONE; ID3v2ExtraMetaAPIC *apic = NULL; @@ -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; }