From patchwork Tue Oct 12 11:02:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 31081 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp4645445ioa; Tue, 12 Oct 2021 04:02:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzurA5oohv3K9vYqfK0//Wt9He9R+t2MhMiimDkkjjI0OWFJlYmA1P6Ow059fP/0pQFY9C X-Received: by 2002:a17:906:a3c4:: with SMTP id ca4mr31939540ejb.529.1634036562091; Tue, 12 Oct 2021 04:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634036562; cv=none; d=google.com; s=arc-20160816; b=u7SXZ98noYF4dQGrJAq4jvVakV7J4l3i1ilYyggWEKR5hKzQtOQs35KiarUEdU274x EMumTi8lIwCLhIZACAj0/xt7TlILTeiSmQd/bzSP/LCVDKcp/c7mmH8A2k4TfRBjzI8M zJE/Uw0rvbXm03WDuGfdUOKcVY326QPW6/sxa5qYvNyfTzAQiqLFL/2tWeSZ3U+UU/dB reAEvml6HaAZ+MoVV6GJanQRZFKHVUIXaXZZVSB18vJ+b6Z8228vML+xTI9DEqn6io8y tIX+7ZI1o0+MCAYef3r5WM5FxeoGUKR3eUAljQJ9TlnWr1sm07Iryehk54T28oP4Qmqm 5yYQ== 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:message-id:date:to:from :delivered-to; bh=WAbuhoEY3MAQ+xEIACRs2nk6lictaLoU0TRzPWge+Fk=; b=HelIMv5KU5cWqiz4bwZsBn5hOeIIAbDalMDyEKMOvPSINPQr62vPeDvLDI1n17Xj0B +5mRPxfDFpzRGahq3Zj0XqFps6QNudimFgJp6aOr2A4nHe/eS4XWYcywEn/CUljDyVWO imHSlMcDTqhvQ+/AVIKE+aUMjcYj5Jwz7/6zl7c5xzqxMCH8dZFYcPHeOEcn4GIAYcO+ n6yvp6ZZORphMas2IdHUWW6EcUzrKI8/3B/Li1IsVR+SEyNXzOaRSZ5ND7KVPnbeZ4Kw Dbyaiaz0yUnsh93ud6vqKf+lcQzW5efSIu9l8xWIMSykTmT3Dzngx98VwkHAZqmot5WR TOhA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f14si12984749edc.450.2021.10.12.04.02.41; Tue, 12 Oct 2021 04:02:42 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E16968A5DC; Tue, 12 Oct 2021 14:02:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out10.migadu.com (out10.migadu.com [46.105.121.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E05E268A408 for ; Tue, 12 Oct 2021 14:02:32 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Oct 2021 21:02:22 +1000 Message-Id: <20211012110224.639056-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: noreply-caprica@cadance.vs49688.net Subject: [FFmpeg-devel] [PATCH v2 1/3] avformat/argo_asf: cleanup and NULL-terminate name field in header 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7FuXDSwFFwfO Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 8 ++++---- libavformat/argo_asf.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index 7e759c7c0c..acf30839b9 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -52,8 +52,8 @@ void ff_argo_asf_parse_file_header(ArgoASFFileHeader *hdr, const uint8_t *buf) hdr->version_minor = AV_RL16(buf + 6); hdr->num_chunks = AV_RL32(buf + 8); hdr->chunk_offset = AV_RL32(buf + 12); - for (int i = 0; i < FF_ARRAY_ELEMS(hdr->name); i++) - hdr->name[i] = AV_RL8(buf + 16 + i); + memcpy(hdr->name, buf + 16, ASF_NAME_SIZE); + hdr->name[ASF_NAME_SIZE] = '\0'; } int ff_argo_asf_validate_file_header(AVFormatContext *s, const ArgoASFFileHeader *hdr) @@ -331,7 +331,7 @@ static void argo_asf_write_file_header(const ArgoASFFileHeader *fhdr, AVIOContex avio_wl16( pb, fhdr->version_minor); avio_wl32( pb, fhdr->num_chunks); avio_wl32( pb, fhdr->chunk_offset); - avio_write(pb, fhdr->name, sizeof(fhdr->name)); + avio_write(pb, fhdr->name, ASF_NAME_SIZE); } static void argo_asf_write_chunk_header(const ArgoASFChunkHeader *ckhdr, AVIOContext *pb) @@ -368,7 +368,7 @@ static int argo_asf_write_header(AVFormatContext *s) } else { len = end - name; } - memcpy(fhdr.name, name, FFMIN(len, sizeof(fhdr.name))); + memcpy(fhdr.name, name, FFMIN(len, ASF_NAME_SIZE)); chdr.num_blocks = 0; chdr.num_samples = ASF_SAMPLE_COUNT; diff --git a/libavformat/argo_asf.h b/libavformat/argo_asf.h index e65125fb79..1fab31a90b 100644 --- a/libavformat/argo_asf.h +++ b/libavformat/argo_asf.h @@ -33,6 +33,7 @@ #define ASF_CHUNK_HEADER_SIZE 20 #define ASF_SAMPLE_COUNT 32 #define ASF_MIN_BUFFER_SIZE FFMAX(ASF_FILE_HEADER_SIZE, ASF_CHUNK_HEADER_SIZE) +#define ASF_NAME_SIZE 8 typedef struct ArgoASFFileHeader { uint32_t magic; /*< Magic Number, {'A', 'S', 'F', '\0'} */ @@ -40,7 +41,7 @@ typedef struct ArgoASFFileHeader { uint16_t version_minor; /*< File Minor Version. */ uint32_t num_chunks; /*< No. chunks in the file. */ uint32_t chunk_offset; /*< Offset to the first chunk from the start of the file. */ - int8_t name[8]; /*< Name. */ + char name[ASF_NAME_SIZE + 1]; /*< Name, +1 for NULL-terminator. */ } ArgoASFFileHeader; typedef struct ArgoASFChunkHeader {