From patchwork Sun Oct 23 23:04:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 38934 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1921084pzb; Sun, 23 Oct 2022 16:07:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM63QokNu2V6YbnjxzlVU/P9ihnv/EU+x5RKcpV/ryCxFiygaVS/DCd4Mgtnb5krtzupdJXI X-Received: by 2002:a05:6402:51c9:b0:45d:5efe:d1a3 with SMTP id r9-20020a05640251c900b0045d5efed1a3mr28069358edd.58.1666566431481; Sun, 23 Oct 2022 16:07:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666566431; cv=none; d=google.com; s=arc-20160816; b=neDd2Mjo/RJTHLO9h4M8Hhso1HYn9+nggUFvadbgNcJ2K2CZSsRQRsN2LuBxOTStNV XDLCkjmSwfV/XJ1pwlh/aSzSF8foDZOdNT5S7zNcx/VYphHlQjFAI9jX7VAyTOtyGxWM C0dhL19+zJGrYXVGAPiqPWshmK2VExr50Wb+/588JJOtl9Txgz1VqW6drVgoAQyv9En5 uurFWh9Mrvw+4iWY0xFYRO/Co4DNkc5tLZjaTn2lARPjSfthmgzEBQH6/Y8mgcqYSgYn 8O90cphwBgFYNgAcVSp0mwLq9D+LivlfUWmM8dp23Rvsv6445zi+MiStmR/R2Su98Y6L Q0YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=pncFv3aOc8whrNywfyUF897gY+4c/owGiMj9QMsePos=; b=Gj1OcnMvnWL6iKFvvBFCCL+wH1A63trfYj3sKAMSlb+sv+kIw9Heql1wp4j+7QOsgx mTNBO1uVPzGcASmhozoNGt5U4y7DPLJ4kcsBnQub6ww/NY7j/JR6SKFDVRxPd9uDnBp/ 6ujO96tL+X72Lsjl0+bERzcrO0RlA9iMdaZ7Ko46yHxKtb5xhIjGR0b7NjmydCOaWyan L5xmm3TD7mDht9lRmZ1A66RayiVo01sKhN42Ic5MJb9Pxmfk+Az4/3ksvukQH8m/ZcPy gSzM6Ys7rTb0zJb8/WsfOA+lggoa2RXwDDi3DzYtb3H2xXytyu3KC7W6/daF3VsRqmAc +Mww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=I3Teed8+; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q4-20020a170906940400b007707ab4be23si2752214ejx.560.2022.10.23.16.07.10; Sun, 23 Oct 2022 16:07:11 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=I3Teed8+; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18CAC68BCBD; Mon, 24 Oct 2022 02:07:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5F8A68BA4A for ; Mon, 24 Oct 2022 02:07:01 +0300 (EEST) Received: by mail-oi1-f180.google.com with SMTP id p127so9252007oih.9 for ; Sun, 23 Oct 2022 16:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=V4alIhIEQe+8aQK/o7PkkVan7mBGKML+ABgmvQeEQBg=; b=I3Teed8+TQUAfKH8Jm5YYPwpwLhTKxg4OBA46mrOLvxzTubxdb84B1RRzacQSfIB8Z 8gNtA70Ny6icbjjpKrJPTTf9v4H8ZzYPWqY9DvZwUzVfS/7jn3Q8dhSA8BCFmzkgsGsF SqYDnWPAwUOjCV9vf5lU60mYb3yHK/DDPPctw7TdFbHZV2YxVU7mzm05H7gSyRsYA7L2 Dil0qVQotbbN54zOYq1T5fZQobbOPkBqE6gu0InIYVJ3G3ZOckUbMZ7/h3vQCgCsGY9A YDq2EbJ1ajr7I4ZSyW+z6c0xgof1JlX0mS2R5fnF45Ao661S82G09t9NhFuTIeLGN/Z9 MLgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V4alIhIEQe+8aQK/o7PkkVan7mBGKML+ABgmvQeEQBg=; b=w7F36OR/HrTfYq7TLcUPjOlAETN7nIXEuMN6qxcUwNLA9l6e0IOhqlE/rWoDJNKTER UCt10r2qImlbkh7JkMpx3iQw3jVBRayZtVrXB5cGsp3tiW3IG11ntrwfN65fV7VJvkfa gLlfeYxNrSF35NN+COpV/x0w497FzsLuyvhgJfK+r3Wlnqbcxe3pxC88E3JlMFMkppMy X7KoiQjLlU7n8eIChPqVJPWAeL9AXinEJWdybEvRwUFL1VFtDUb9yD4MUiIRnngU32XE azOEYxZdhgzwSEeclqJ9SO3Se8nR5q07ILlK53gY+3LoC59TpYr9HVhqNrnd0O5SyrSb 2feA== X-Gm-Message-State: ACrzQf32GJyke77C1KgpydXsF8JA77c+zriHrZ61JKXGOlkphyKBXgtv CoI0XTHRX9p6Gj1xB51QVuV+D3ph5rg= X-Received: by 2002:a05:6808:1404:b0:355:4cd4:b10b with SMTP id w4-20020a056808140400b003554cd4b10bmr16312569oiv.207.1666566419997; Sun, 23 Oct 2022 16:06:59 -0700 (PDT) Received: from localhost.localdomain ([191.97.187.183]) by smtp.gmail.com with ESMTPSA id z36-20020a056870d6a400b0012b298699dbsm13550191oap.1.2022.10.23.16.06.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Oct 2022 16:06:59 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Oct 2022 20:04:19 -0300 Message-Id: <20221023230419.1278-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221022210226.2200-1-jamrial@gmail.com> References: <20221022210226.2200-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/adts_parsed: allow passing a pre allocated AACADTSHeaderInfo to avpriv_adts_header_parse() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZYcgntJt87qP Code freeing the struct on failure is kept for backwards compatibility, but should ideally be removed in the next major bump, and the existing lavf user adapted. Signed-off-by: James Almer --- libavcodec/adts_header.c | 2 ++ libavcodec/adts_parser.c | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libavcodec/adts_header.c b/libavcodec/adts_header.c index ff4efafbf7..00fa0a5a99 100644 --- a/libavcodec/adts_header.c +++ b/libavcodec/adts_header.c @@ -32,6 +32,8 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) int size, rdb, ch, sr; int aot, crc_abs; + memset(hdr, 0, sizeof(*hdr)); + if (get_bits(gbc, 12) != 0xfff) return AAC_AC3_PARSE_ERROR_SYNC; diff --git a/libavcodec/adts_parser.c b/libavcodec/adts_parser.c index 4a1a8fd5f4..f2e155fc99 100644 --- a/libavcodec/adts_parser.c +++ b/libavcodec/adts_parser.c @@ -47,24 +47,30 @@ int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_ { #if CONFIG_ADTS_HEADER int ret = 0; + int allocated = 0; GetBitContext gb; if (!phdr || !buf || size < AV_AAC_ADTS_HEADER_SIZE) return AVERROR_INVALIDDATA; - *phdr = av_mallocz(sizeof(AACADTSHeaderInfo)); + if (!*phdr) { + allocated = 1; + *phdr = av_mallocz(sizeof(AACADTSHeaderInfo)); + } if (!*phdr) return AVERROR(ENOMEM); ret = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE); if (ret < 0) { - av_freep(phdr); + if (allocated) + av_freep(phdr); return ret; } ret = ff_adts_header_parse(&gb, *phdr); if (ret < 0) { - av_freep(phdr); + if (allocated) + av_freep(phdr); return ret; }