From patchwork Wed Jun 24 23:32:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20596 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 C9A364491EA for ; Thu, 25 Jun 2020 02:33:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B26AD68098D; Thu, 25 Jun 2020 02:33:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B14C1680852 for ; Thu, 25 Jun 2020 02:33:01 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id e9so2282081pgo.9 for ; Wed, 24 Jun 2020 16:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XDjTShOmAqWvAUNzd/LFyB0XgPxmHa5Qd2KAMI1+ZiY=; b=r92kIAoAAbFr5UcNttpu675t6rxf1Rg+5emJwpdtuwlxmBo4iOlO3NI9qin/RSSard jxcdLff9t+t3fx1EDCHB52ZDxTqrCcw+0L0YK8ocTTWqSIWNFqKncoxLV/dZ7NqkoMp6 7/zgAwuoaHZwCek1f61slIMwNmds5/z60WYVSVVuO95B2KmnIsZusMnFUomrGf3Ko3AA 3N0f9UlX2J/JHieYo2QfELbC5meKCmKmuM9Vh211adAt5pCx+sUUFzh7b/iJczoerSko OKT2mIvII++uy6Lck1hZ+/r6gfRprUaP7KgJ6gMrChPdBExUeo6jroWLVX8zG3vprh5g frXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XDjTShOmAqWvAUNzd/LFyB0XgPxmHa5Qd2KAMI1+ZiY=; b=KJrEe/bqYWkF3hKX23Gs/iSE4UZO6pvnIl20c3xeb4f2LiQlVgzQymKMgfvgcGhfzE weKRK9Cmw9e92QvczsmaH4ki+1Q5AjRlCS6bkSQHDl0samhdpFwQFen4tHTRuI06y8BE ZcmHCsitJDefoLk/DuagVmWm91j4/tFJu4IpNe1UCogazgUkJ7QCQJCaK3Yjg8aKXryp 9P3FrBJzf1M3BtOWEkoQXbI8KdZp/mdEGPoVTDWUZ+qWF/rKDwRDjoOYRC1Lm345vNwZ b6SnoGRq6H6gzVLFu30upXN++WRJFAx2yZv/xnvpGBAiFAMvieB6GxHLLaWwYRKBebGl zEzg== X-Gm-Message-State: AOAM533IrSVPXJAfJS4DUPB9LmJG/u0Q+46aB8kusgkN8UhQYbv7CE19 l3kibFGYag51fBd3ddLGu4o2LVSw X-Google-Smtp-Source: ABdhPJwVSKtmyllWnAzMGuiNYRhzODIAwzt61sjsGQe5yuRj47MRXxyuRGAY1tmYutnl0xmXn0iiyA== X-Received: by 2002:a62:140f:: with SMTP id 15mr4419383pfu.50.1593041579896; Wed, 24 Jun 2020 16:32:59 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.32.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:32:59 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:36 +0800 Message-Id: <1593041559-27350-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 3/6] avformat/au: check return value of au_read_annotation() 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/au.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/au.c b/libavformat/au.c index ff9176a..f92863e 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -145,6 +145,7 @@ static int au_read_header(AVFormatContext *s) int bps, ba = 0; enum AVCodecID codec; AVStream *st; + int ret; tag = avio_rl32(pb); if (tag != MKTAG('.', 's', 'n', 'd')) @@ -163,7 +164,9 @@ static int au_read_header(AVFormatContext *s) if (size > 24) { /* parse annotation field to get metadata */ - au_read_annotation(s, size - 24); + ret = au_read_annotation(s, size - 24); + if (ret < 0) + return ret; } codec = ff_codec_get_id(codec_au_tags, id);