From patchwork Sat Jun 11 07:32:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martijn van Beurden X-Patchwork-Id: 36159 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp206046pzj; Sat, 11 Jun 2022 00:32:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXM7rJqe9BB3CPtCMYyWyZ0YDo0C2NzIUxF+kbN061r3GZuRo6T8k8yWxp5VvxqHXBumgE X-Received: by 2002:a05:6402:51d4:b0:42f:b38d:dbb9 with SMTP id r20-20020a05640251d400b0042fb38ddbb9mr43792038edd.255.1654932756856; Sat, 11 Jun 2022 00:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654932756; cv=none; d=google.com; s=arc-20160816; b=SNrkOu3cmdTFN3KCTBh3C5FouIXEtaYyld03xgwGW5MKlEm8oRu45j0fKMkXnEdcgq T125dDFs9ZYfQjUV0H9Di2l2SBumqoaSc+kFcsJALBsaFIZq6jU3RekDMqiWv41rleRG 3D1cGwks7r7eQRQtcIApxYUaUiabPPbUquJxcaQqgT88D2r5WrJsmeKUlcD34uoLJTZl upChLelieRjg+ohWXVK+YlFTYS2B9hINC4jwowhI9NUlE67T5YQozJxBbrVlPN0Gy5Ng OpyiFcRjX9BEoP3gKqS4yYnC+V19jbigavdjZjGItXejjobZ8ftc/PXo1F4mD6BQPA5c 7NFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=GlTWcAKoVH9al059eF3Fi/BVEoduas1nIGmK7qBDvbc=; b=L/fmom1xRxK2I5e+Lh91MjwpN8GK64YePPzvBGISFJPt6c+5B5lUOs4qndLYFfuJR1 Puw0t0IGsG3vwUfPd7zgD33DS1yRVjxLSZmgCPK1i5ct5jdcIUJ5fyZKcgLwHyCLsSwH PEXqiUqccIUE/Zmh+sb4QxLtD8DYlF7XbSLsjhHg9FL7UhIEnDmFtZtlJV4y/iaIlAD5 0+a5QLySktJ71xrcdufUestYwf37fWEBiWoJNrR7asrNS9t+I/vNa97Ra5PGWA1pmxJF IMOPRYbYgv5+EQ29J/D0sbJ9tWDIg82wOJOh3SgYo9lhfkNHg4ojev36Lez1PdtHH910 YT8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PKpmaU27; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r16-20020aa7da10000000b0042bc58fa120si1223112eds.118.2022.06.11.00.32.36; Sat, 11 Jun 2022 00:32:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PKpmaU27; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 98F6568B583; Sat, 11 Jun 2022 10:32:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98F6168B2D1 for ; Sat, 11 Jun 2022 10:32:27 +0300 (EEST) Received: by mail-ej1-f46.google.com with SMTP id n10so1906301ejk.5 for ; Sat, 11 Jun 2022 00:32:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=09TpiaL5k5YvjEFgHuutWZA2HIcCK/cR3YiAEg8XEdE=; b=PKpmaU27CQgPnuEnmi5/B90vXr1rhRadS64yxZ8itGDsJseJ08sOkP1mhnR1JjUpIG dRX6Jt2ya4MEDJSB8gYCdbpek1D+iF445iLzu5zwD/Z4jraLHZEuh2tOm+gt1Qv5f2S5 YBjJIMwoL6SzpzEkVlaw8D+mWJ+IXjTT1cT+sgab14kIYwkRI91MWnbFiMsW0aAL8WFe xkHPwvvX8BnhAHIUcMD8gfobH7qk0WdzISsz9eIyOnW0dGdSBK746qpJ5TmC9VowD0wQ rIT5rg+ey9OFAOdKxsNh12QbFxB7uN8q70KNlqq0iGJz8C5+uQBeODLwWBt5Tj5II8HU 47Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=09TpiaL5k5YvjEFgHuutWZA2HIcCK/cR3YiAEg8XEdE=; b=lLF2z2AKrgKOE97LEpB2RG7bSdjRE4HF1Dmti7TmrmZ0nNiP46SR5TlxWO3CCU780X LzU6skLM7SUDLcNpkxeOdjo6ufYo5MfMBigtx73ZeI6EDa0PCMWB9ph7U44Q+J2GUveP GeE9lO5hqoHNIa/rsZrCWQ0Tx64eQ2j1vBimp2yISHK9vmbE9hs3zuMkZijK4hklo99n lxqboA0ySHvbehyfprsfFTj2l343xETOKFGiIV9WnT5973JoVP5sKQlDHuRDIdUJVyBA EsqxnXg42+gTq5bcvc4pI/GYH9ksowPofffSw3A7mghljqm+7D9y5pi0ch2IzgxgJthV T/Dw== X-Gm-Message-State: AOAM533KX4ocR6cqTdjgiNJYgvoAWl88tMEY/dDcXa4y5Cwxr5b4DE+3 7Lu++Ed+F9oQ+FymbVahAY+knuhtnb8Z4w== X-Received: by 2002:a17:907:c202:b0:710:8d0c:6e89 with SMTP id ti2-20020a170907c20200b007108d0c6e89mr33549187ejc.141.1654932746830; Sat, 11 Jun 2022 00:32:26 -0700 (PDT) Received: from localhost.localdomain (92-64-99-37.biz.kpn.net. [92.64.99.37]) by smtp.googlemail.com with ESMTPSA id t19-20020a056402525300b004333e3e3199sm907337edd.63.2022.06.11.00.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jun 2022 00:32:26 -0700 (PDT) From: Martijn van Beurden To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Jun 2022 09:32:16 +0200 Message-Id: <20220611073216.1930852-1-mvanb1@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220604103507.1822192-2-mvanb1@gmail.com> References: <20220604103507.1822192-2-mvanb1@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] avformat/mov: prevent potential use of uninitialized value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Martijn van Beurden Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: j5czlzfQtgnF --- libavformat/mov.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index d7be593a86..51c0f6f9d8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6772,7 +6772,10 @@ static int mov_read_dfla(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_rb24(pb); /* Flags */ - avio_read(pb, buf, sizeof(buf)); + if (avio_read(pb, buf, sizeof(buf)) != sizeof(buf)) { + av_log(c->fc, AV_LOG_ERROR, "failed to read FLAC metadata block header\n"); + return (pb->error < 0 ? pb->error : AVERROR_INVALIDDATA); + } flac_parse_block_header(buf, &last, &type, &size); if (type != FLAC_METADATA_TYPE_STREAMINFO || size != FLAC_STREAMINFO_SIZE) {