From patchwork Sat Feb 18 23:18:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp862874pzk; Sat, 18 Feb 2023 15:19:13 -0800 (PST) X-Google-Smtp-Source: AK7set/xfcXi0r8yfNnyJ+8sd9ll0TbAJVlMqYhMXcvFfU/53pesVSl3ueMOLsisROXEWKiiEi2E X-Received: by 2002:a17:907:98bc:b0:8b1:7b10:61d5 with SMTP id ju28-20020a17090798bc00b008b17b1061d5mr7625307ejc.33.1676762353740; Sat, 18 Feb 2023 15:19:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676762353; cv=none; d=google.com; s=arc-20160816; b=DN5SZajY1XlAJlSWGlYf/KLOa3aKtf82/x/hmn1iXtCFM40CwjPZdg2Grw6KfAk4wl SrNgbEU8uvyYBar2IcVNnc4VWOr2a+GNXTNN+S9hLLMkwgVGnYg3xUjWKvRhDXejNWCe Ds/OJiaE4HDBi0fLMf/Xetdt9C2L2m8aoDDV7bc+jVEn7lvaZslKcy5uwHCITAb1wM1E 4+ajPDYGkuXnNnTj63MdBtaUhZTlX1KK8wU5tqcrcnWkNHxBUnzE+iLB43XH+WKL/Jh1 ESve4hpEZwiZ21Vc9dVQnw5lKHvWuJlqjg1lX0lRvt5C8/zJDl2S51j6IinWdSGYZt1d Oo0Q== 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=wna8fUDsKp4Eu0AYSuk3/0W/zuXyJ0QCFS/REmyVIhQ=; b=GYJfrMWYXJ9gZ/93Dqpzn3aShdkHnWB5WPGQksSYpFPeI5WOwMLj0GiR06AA/5G4T6 IJpetQOkJrMK0to6un7wtfhmHymz0Awq+CztmKjeX54fFlcJ/dMA7fNpiWx3t3SofH12 cmiLQ40eai88l3WafFNb9P12d+YYr/PK4iI4WuIGeGz0MeKfT1h7++OVzrGzZAYOcwoC G+7h/vaACvZOqh8JGBDJoHgk2v+EkFr8Sw4v82bZLJU/dmORyv5KKVS6PgmNR+pS4hzb JU+60Mqeo1j+rIhKHQYOKSc3f4oqLZDtB7DkD6x8JJV4Pbrwo0QVV8gBy4Wll9LGMty+ u3hw== 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 b26-20020aa7cd1a000000b004acc7e6e1bfsi9528212edw.311.2023.02.18.15.19.13; Sat, 18 Feb 2023 15:19:13 -0800 (PST) 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 85A8C68BEB5; Sun, 19 Feb 2023 01:19:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1BD968BA15 for ; Sun, 19 Feb 2023 01:18:53 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id D6648FF802 for ; Sat, 18 Feb 2023 23:18:52 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Feb 2023 00:18:49 +0100 Message-Id: <20230218231850.20522-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218231850.20522-1-michael@niedermayer.cc> References: <20230218231850.20522-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/wavarc: Check if extradata has been fully read 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: fUGoWZxrf1uU Signed-off-by: Michael Niedermayer --- libavformat/wavarc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/wavarc.c b/libavformat/wavarc.c index 208b723716..2b5d1b99eb 100644 --- a/libavformat/wavarc.c +++ b/libavformat/wavarc.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "avio_internal.h" #include "demux.h" #include "internal.h" @@ -84,7 +85,9 @@ static int wavarc_read_header(AVFormatContext *s) if (ret < 0) return ret; memcpy(par->extradata, data, sizeof(data)); - avio_read(pb, par->extradata + sizeof(data), fmt_len); + ret = ffio_read_size(pb, par->extradata + sizeof(data), fmt_len); + if (ret < 0) + return ret; par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = AV_CODEC_ID_WAVARC;