From patchwork Mon May 16 01:16:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35784 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1324343pzb; Sun, 15 May 2022 18:18:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYaTYLr2BUpOPBApdBg/dvvbXSkmrDXE3RosiWy+84WKLj5VY7BHwxI/ILsaJFtWKgRKd1 X-Received: by 2002:aa7:cdc6:0:b0:426:3c4f:c2b8 with SMTP id h6-20020aa7cdc6000000b004263c4fc2b8mr10823871edw.348.1652663895762; Sun, 15 May 2022 18:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652663895; cv=none; d=google.com; s=arc-20160816; b=f+lmOOyNFaQAuNWfEQPo2lUt7SopxOmPmirqv6XGpxsEHsB9SXGeTiqyTSxs94HuAW s/YDHK54/8d853cF+RImrFR8N3o23rX1nC6vi8I4Dj7byV5du6mpx6G/bvYVVq5Snzjb vLTcPqRZYiS9gEzV43YddvlaXh9gv6WhbgBmNbToQYaxC4qulAbbMunkE4O0gPDNcXDN n1SZ5rngdhEXiHPVkl3hG9DHIEX2OvhPa6IiefZnYY/3N8yXBpxPHJDUa9nyBoQeI4a+ M6XdUzbHQB3ivtKzkzFptXr4KfabSdohVk+O/BhB2o18dbs0C+1mkxmSP1ZcScMD5xUM JgLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=kCOejwSmtIcp6cROhlQOsl13Hc30mVIr/fIid5JEQho=; b=f0wms+hG65qIqBgs3I0m/p2aE6kA0Fh865yrIbvs9Y6psHM3k89XGbIKFwrVhNpE6/ si7yi7DnNGuq7cNPDPB98taaqUjWYqcuzhJN+fFFSzYu2rPJ5c3Z3BoEyH2jmzzK2OBL H+0Xf2MZWjbt3R+neKD2+lVUu/WKEsiW/I7X6xfZk2yPnOy6TCO6s/3m0Ctfxttbs8R/ UQL11kZ2XiSTQFdKeCm3Z/uAFY5M+PCECXpgNLdAtb6Efg0oJ97EF2D67JGA+oSuLiFC uL1rxoNRszsytDb89yTNKaLHDKpg03rH9rqtUg5lS+W512A8Fat+SW5aiPn2n+8JrCV3 bRpA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hv21-20020a17090760d500b006f518a02306si7822090ejc.642.2022.05.15.18.18.15; Sun, 15 May 2022 18:18:15 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81EE068B4F9; Mon, 16 May 2022 04:18:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-1.mx.upcmail.net (vie01a-dmta-at01-1.mx.upcmail.net [62.179.121.145]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4581468B500 for ; Mon, 16 May 2022 04:18:07 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nqPN8-002pG8-Hs for ffmpeg-devel@ffmpeg.org; Mon, 16 May 2022 03:18:06 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id qPN8nCwaE8s8UqPN8ntbO1; Mon, 16 May 2022 03:18:06 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id qPLCnBLLqOPqFqPLCnEW66; Mon, 16 May 2022 03:16:06 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=6281a5d6 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=s-SmoVCtHytnRkX7i2wA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 16 May 2022 03:16:04 +0200 Message-Id: <20220516011605.18792-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220516011605.18792-1-michael@niedermayer.cc> References: <20220516011605.18792-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfN8RKDrWXy71pqQBYhei5ymiZvXzP9TUL5o1R5fwexwiJdd3pc2h467CoZ53fjbZb1DN903Cya5hClIQVm8ggWLdRzfyeb+05748BvW4xLtusskyRa8g nhVZWjhZ1soiG3pBwyp2XFi9PsoSlVlujb6VRcRBkuI52eduHglDNvziYsKaj2N3Hflf1MoMal4v+A== Subject: [FFmpeg-devel] [PATCH 2/3] avformat/act: Check ff_get_wav_header() for failure 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ChUC3qVQA+L9 Fixes: missing error check Fixes: CID717495 Signed-off-by: Michael Niedermayer --- libavformat/act.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/act.c b/libavformat/act.c index 6dd9f62a87..da73fcceca 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -68,6 +68,7 @@ static int read_header(AVFormatContext *s) AVIOContext *pb = s->pb; int size; AVStream* st; + int ret; int min,sec,msec; @@ -77,7 +78,9 @@ static int read_header(AVFormatContext *s) avio_skip(pb, 16); size=avio_rl32(pb); - ff_get_wav_header(s, pb, st->codecpar, size, 0); + ret = ff_get_wav_header(s, pb, st->codecpar, size, 0); + if (ret < 0) + return ret; /* 8000Hz (Fine-rec) file format has 10 bytes long