From patchwork Sat Sep 26 02:38:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 22594 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 5BFBA44B3D5 for ; Sat, 26 Sep 2020 05:38:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C9B168AAFD; Sat, 26 Sep 2020 05:38:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA090689C54 for ; Sat, 26 Sep 2020 05:38:51 +0300 (EEST) Date: Sat, 26 Sep 2020 02:38:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1601087930; bh=m8fZe/nxpNYV9IvTyLtRmqq/tNz77/t837AJTRqsRy0=; h=Date:To:From:Cc:Reply-To:Subject:From; b=CV2DS6bf08gV+BGXx0cucQ7tnR5wTJjoUY566/5d1NYxLyo4ktdi0KatY5joxBMb+ 2NRuHqOCMwAGZOmq950VAJIm1vf6lv1YoKNoYbQ4uU6WQm+PMW/k5nyq9cLEpXZEdH m0D9AZ+utU+wqsXnkifsH3mg1Jfw8WBRo7ldSxYZoI5RrqkD0mOUsqiuaJhmZdqeHi i/VlE4/t7c8yedd+efZB5mTGQWOkTb/1VmIu+XRr5jBenVXi6UVBIQ3CJ455kFv2ji E+jbiqqfWvOcurMBY35ALPdU9dKA3k5ygh9rZXQnBfDe6V5aA0xygKEjnM5YcxS32w z5tRYTSTxiEIg== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200926023817.7891-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH 1/6] avformat/argo_{asf, brp}: fix potential segfault in ff_argo_asf_fill_stream() 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 10 +++++----- libavformat/argo_asf.h | 2 +- libavformat/argo_brp.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index de941caeac..8e2bf21c71 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -75,17 +75,17 @@ void ff_argo_asf_parse_chunk_header(ArgoASFChunkHeader *hdr, const uint8_t *buf) hdr->flags = AV_RL32(buf + 16); } -int ff_argo_asf_fill_stream(AVStream *st, const ArgoASFFileHeader *fhdr, +int ff_argo_asf_fill_stream(AVFormatContext *s, AVStream *st, const ArgoASFFileHeader *fhdr, const ArgoASFChunkHeader *ckhdr) { if (ckhdr->num_samples != ASF_SAMPLE_COUNT) { - av_log(st, AV_LOG_ERROR, "Invalid sample count. Got %u, expected %d\n", + av_log(s, AV_LOG_ERROR, "Invalid sample count. Got %u, expected %d\n", ckhdr->num_samples, ASF_SAMPLE_COUNT); return AVERROR_INVALIDDATA; } if ((ckhdr->flags & ASF_CF_ALWAYS1) != ASF_CF_ALWAYS1 || (ckhdr->flags & ASF_CF_ALWAYS0) != 0) { - avpriv_request_sample(st, "Nonstandard flags (0x%08X)", ckhdr->flags); + avpriv_request_sample(s, "Nonstandard flags (0x%08X)", ckhdr->flags); return AVERROR_PATCHWELCOME; } @@ -116,7 +116,7 @@ int ff_argo_asf_fill_stream(AVStream *st, const ArgoASFFileHeader *fhdr, if (st->codecpar->bits_per_raw_sample != 16) { /* The header allows for these, but I've never seen any files with them. */ - avpriv_request_sample(st, "Non 16-bit samples"); + avpriv_request_sample(s, "Non 16-bit samples"); return AVERROR_PATCHWELCOME; } @@ -212,7 +212,7 @@ static int argo_asf_read_header(AVFormatContext *s) ff_argo_asf_parse_chunk_header(&asf->ckhdr, buf); - return ff_argo_asf_fill_stream(st, &asf->fhdr, &asf->ckhdr); + return ff_argo_asf_fill_stream(s, st, &asf->fhdr, &asf->ckhdr); } static int argo_asf_read_packet(AVFormatContext *s, AVPacket *pkt) diff --git a/libavformat/argo_asf.h b/libavformat/argo_asf.h index eb2669a63f..e65125fb79 100644 --- a/libavformat/argo_asf.h +++ b/libavformat/argo_asf.h @@ -65,7 +65,7 @@ enum { void ff_argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf); int ff_argo_asf_validate_file_header(AVFormatContext *s, const ArgoASFFileHeader *hdr); void ff_argo_asf_parse_chunk_header(ArgoASFChunkHeader *hdr, const uint8_t *buf); -int ff_argo_asf_fill_stream(AVStream *st, const ArgoASFFileHeader *fhdr, +int ff_argo_asf_fill_stream(AVFormatContext *s, AVStream *st, const ArgoASFFileHeader *fhdr, const ArgoASFChunkHeader *ckhdr); #endif /* AVFORMAT_ARGO_ASF_H */ diff --git a/libavformat/argo_brp.c b/libavformat/argo_brp.c index c417818639..a60de59f64 100644 --- a/libavformat/argo_brp.c +++ b/libavformat/argo_brp.c @@ -289,7 +289,7 @@ static int argo_brp_read_header(AVFormatContext *s) ff_argo_asf_parse_chunk_header(&brp->basf.ckhdr, buf); - if ((ret = ff_argo_asf_fill_stream(st, &hdr->extradata.basf, &brp->basf.ckhdr)) < 0) + if ((ret = ff_argo_asf_fill_stream(s, st, &hdr->extradata.basf, &brp->basf.ckhdr)) < 0) return ret; /* Convert ms to samples. */