From patchwork Mon Sep 14 23:31:00 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: 22384 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 5B7F344B64F for ; Tue, 15 Sep 2020 02:31:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 394A968BA8F; Tue, 15 Sep 2020 02:31:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6889568B9BC for ; Tue, 15 Sep 2020 02:31:06 +0300 (EEST) Date: Mon, 14 Sep 2020 23:31:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600126264; bh=Pd7BPXfukIKdT00ifVMV1tguVUdtqqE/SmY2tihoJ14=; h=Date:To:From:Cc:Reply-To:Subject:From; b=0UqTtt+X9kdFN/DFgoUjmzxdxG7nW3XQCBwnsO8+ckd6rXDcp0EiLpUNLWj2GhrcL qzZs8geB2UObGTkBv1Jnl5qLPb0VNuGwWnbZBRs71vVe/oLirHWUsay1DmKqUW0u5d cfG6eOkBicKSD1Gv9QshYrQ74h7sniEG75Y1a0hOkIwtt+bP26QZ9UIO0//fSkAAAq OI15d+YQXp7eh/2/s7psmnEnevyDV1BZb9g//X9orOZuNVDkYyCvUw+/pUj2oWLphQ e3hx8nBnMk+yPSxuIjncVp9Wf+0AJtqvwdd0TE6Sr4AhPcanJOj5V30IBzX5VYnBsy oVLlopYZtPp1g== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200914233053.2846-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] avformat/argo_asf: initialise file header inline 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" Garbage was left-over in the ArgoASFFileHeader::name field if the url was too short. This zero-initialises it. Signed-off-by: Zane van Iperen --- libavformat/argo_asf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c index c131207aa1..b1632f3ba5 100644 --- a/libavformat/argo_asf.c +++ b/libavformat/argo_asf.c @@ -314,14 +314,15 @@ static int argo_asf_write_header(AVFormatContext *s) { const AVCodecParameters *par = s->streams[0]->codecpar; ArgoASFMuxContext *ctx = s->priv_data; - ArgoASFFileHeader fhdr; ArgoASFChunkHeader chdr; + ArgoASFFileHeader fhdr = { + .magic = ASF_TAG, + .version_major = (uint16_t)ctx->version_major, + .version_minor = (uint16_t)ctx->version_minor, + .num_chunks = 1, + .chunk_offset = ASF_FILE_HEADER_SIZE + }; - fhdr.magic = ASF_TAG; - fhdr.version_major = (uint16_t)ctx->version_major; - fhdr.version_minor = (uint16_t)ctx->version_minor; - fhdr.num_chunks = 1; - fhdr.chunk_offset = ASF_FILE_HEADER_SIZE; /* * If the user specified a name, use it as is. Otherwise take the * basename and lop off the extension (if any).