From patchwork Tue Mar 2 09:16:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26057 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 3239444B121 for ; Tue, 2 Mar 2021 11:17:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E19568AB25; Tue, 2 Mar 2021 11:17:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32C7F68AA16 for ; Tue, 2 Mar 2021 11:17:04 +0200 (EET) Received: by mail-ed1-f53.google.com with SMTP id h10so24194340edl.6 for ; Tue, 02 Mar 2021 01:17:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=bTgXpgHy5bgTLL7dYzSUYIOijecMw5TpiCp71Ku7G9A=; b=K7bY4qUSrsZzAI12V2Se6YOFQLvI2rsdh6PT9c3TNRoUUU7s4B0vtYQw1U19wnPgQa V/CmNI94UTC+T4gaQP3gy5AGXYWUQ2dvSNYIBMyCNW8F2lICL4XnVw4Adr02PDZgyKto in3xLsqABZYhli/Xk6kjFVONypReqI1rfO4XGPKOM+qTe0CrWjjlUtQgsYMUJcHaErqX 6CwGze/Q4W/h8YuE/B8C6XPL5Rj6l9feIUaDOTkYHrehNOH3zgA1s+Wk6r/CWt/r7td2 K/Tmv3g+rUUQaBhNeAtPUdg+40t4vlZWQpT8tSEb+WjeqzGshY1NX3Y8c5r1Byn1XoMZ 9jzQ== 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:reply-to :mime-version:content-transfer-encoding; bh=bTgXpgHy5bgTLL7dYzSUYIOijecMw5TpiCp71Ku7G9A=; b=sfuBFT4aqOrvZBtPgwQkm9orkHfDy7r/RyhcismTRmVx9CqjmqETtzy8LB6Yo1NJ8F HrG2dENabJQhXAfBWNBvOTI32WsboJXXmh5rkzMqvbhVheLveFqNNK4hcbAEmhrOpkj9 gPqlpzhy1CA6mp5BStL7Wu+kBPSbdpYDct5TQFw2hCj6SqJ0UdfozGOezgFsMfYqFodz cBN21nvzj4axaN+atDK+HDiKfWD71qMIFMukSfL/kVoVyIKLKMmIuQdvMHHWfXg2juYH ZIdanIejbNL+hkxRIUbnqmzRYVmzpyBLsWkE45URwXzL8ngmtobQ1su0BqHlCsK699ya UF4g== X-Gm-Message-State: AOAM530NUOEl4zxpANR+Oh7peicTwnglUGuA9LljMHvU0Px7sBbf72Va eLlRlCXebujY77liFq421lQMI6Nz4Dg= X-Google-Smtp-Source: ABdhPJzLL84aDW5MFbTeJiJC7IUJtWyACfiCIa3LCYx5BrVWK6k1aMvk/LyZQe8haab4Lk+wyUoCjw== X-Received: by 2002:a05:6402:203:: with SMTP id t3mr19833609edv.306.1614676623495; Tue, 02 Mar 2021 01:17:03 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id v22sm166030ejj.103.2021.03.02.01.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 01:17:03 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Mar 2021 10:16:56 +0100 Message-Id: <20210302091657.473380-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/aadec: Use smaller scope for variables, remove initializations 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" avio_get_str always zero terminates the strings it reads. Signed-off-by: Andreas Rheinhardt --- libavformat/aadec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/aadec.c b/libavformat/aadec.c index 612e66906d..b1e93ea072 100644 --- a/libavformat/aadec.c +++ b/libavformat/aadec.c @@ -72,8 +72,8 @@ static int get_second_size(char *codec_name) static int aa_read_header(AVFormatContext *s) { int i, j, idx, largest_idx = -1; - uint32_t nkey, nval, toc_size, npairs, header_seed = 0, start; - char key[128], val[128], codec_name[64] = {0}; + uint32_t toc_size, npairs, header_seed = 0, start; + char codec_name[64] = {0}; uint8_t output[24], dst[8], src[8]; int64_t largest_size = -1, current_size = -1, chapter_pos; struct toc_entry { @@ -104,8 +104,9 @@ static int aa_read_header(AVFormatContext *s) if (npairs > MAX_DICTIONARY_ENTRIES) return AVERROR_INVALIDDATA; for (i = 0; i < npairs; i++) { - memset(val, 0, sizeof(val)); - memset(key, 0, sizeof(key)); + char key[128], val[128]; + uint32_t nkey, nval; + avio_skip(pb, 1); // unidentified integer nkey = avio_rb32(pb); // key string length nval = avio_rb32(pb); // value string length