From patchwork Mon Apr 17 23:59:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2747375pzb; Mon, 17 Apr 2023 17:00:09 -0700 (PDT) X-Google-Smtp-Source: AKy350bdhMr5/nokQkP6Uq5oPcS7xm4d7RlnE4QtMHvwppUSzperIVbI2c5/apLpVb+V7WrRPkTJ X-Received: by 2002:a17:906:e12:b0:94a:74c9:3611 with SMTP id l18-20020a1709060e1200b0094a74c93611mr10436212eji.35.1681776009586; Mon, 17 Apr 2023 17:00:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681776009; cv=none; d=google.com; s=arc-20160816; b=cNthiDK/NbUQzsSOis8Yj1hTPtOuNd2P5vuAy8UNhk71JYGmNDEbtvvVHjq/eI0Oj3 B+0YQWUt/nHMgghsQEvYsC5GRN7twtOGxINFJbF4da03n55AU+6sDVSSvVNF6894zj/M g5zKdTdetwF2jj/Ji7YP/IEdR295vJd7YKgWpK70tMPeOkKpGfGTr/MhboU3bAh5g6eN p2mF1PxruCICpakIVnlxMXbBOnTPmjujqJ7MUZriSBoFSkXpjA9q17JzwsHvJmmhyQEN KYN3fC/26A7kizHQvMbQKyJaExX/4mlMomjhKuzdgCdwAUatQjr5BulHTl89CSjEdg5F FeDw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=WVRgJ2K372EAXa4LfmbYNDlXgnld3NDAVawPeAgkD3o=; b=xvAyyfuYY2eZdcyfdntZJTV9O+h/xjDmTE2CNbnHL8z5TjF8ckcpuFGBdeCLPgxBZc eXt0juThHY/L3+JJqirOqDutMIiIre+2baRd5zPXNT2E3vd70o7wHzHJZ+oIQDf18Z1H YyWydMlwxFu8aDq2itovt/dfjrui2I2Td1f9H2rr7wAAxHqkqiUXVNPPpvifZxaHgHdB s136WGFZK0rjsesU3Ky7k6aC3yoC/SeebgCMDWbq9/Sxe0GxUTyCYpCv60Ya+oxvVRf2 PYgANDzvpxQtw43tM6q1zERy/Cw3vOeApVyZJEeAXr63/RJ/+bmYOMA1tu4f3XrOC+sO 3oDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=bZVc+3iV; 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 g16-20020a170906521000b0094a511ab44dsi10658854ejm.617.2023.04.17.17.00.07; Mon, 17 Apr 2023 17:00:09 -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=20221208 header.b=bZVc+3iV; 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 6542968BE2B; Tue, 18 Apr 2023 03:00:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D585B68B7DE for ; Tue, 18 Apr 2023 02:59:56 +0300 (EEST) Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-541b5ee8a8cso26279eaf.0 for ; Mon, 17 Apr 2023 16:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681775995; x=1684367995; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=zOMDgluWD1Um3E4/AYrZfxahGDLxyg7ZHmPV6JMq0kk=; b=bZVc+3iVVdxOBmlokfpoOYOjwEsviIFdO2dY9Sxr//RorIIg/5HgRbmmonfHkN6XLT P8S62g7vHeycKf6HNdUahS30T6uZ+ylCb4mD96jz0A7HBPGURgcAPrtG4j9skxku6edb GO2nKrfiO1XpQq8MHqXSYWe+cDDJ0GRZTuqXAykCkDMt7vZUaEQK3cL3Uhj+Ib0sVR8T r9IZaciRckTNcBgXaRNRFfF8dcwWBMdCi5xt5TaLgyha2XH+QCIHq+RJqTo+yWdM8XLO 0IUtuhKtruMhc7jHoFB09ztBQK5TNpq2gxwjCdz8J7DFKGJforKoOEiRtCYJx9hj3ISz ygdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681775995; x=1684367995; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=zOMDgluWD1Um3E4/AYrZfxahGDLxyg7ZHmPV6JMq0kk=; b=E3Ej7H5pQ7xcD+eZ3jsQCY0q09iSG9plHw+cqlOBb8k6atJr2D1JaMaKm3MVkp+3kp WleEW6b27lJ7Is0X8JDhhG5Hj+SerL21bCp5HTrgoxIFM/OyXS3p8F0Q+Dagb2k9Sa6U Dn4EX+NPserNeq9vEWCHUxtorw7NIdi+M2+pi3t9OlGmYDHCwwHpwIrKEEWebRjfwwZt yds+Kd5xPs3W+nADrmTPzreBwRVwjHPqwi/XU06C538fYE6MkJN7LoimAzO+D1Q8JmL+ fFoWZPi999KKYrQ/A4tFUllwr+EV29Ci6aznZpjzGGi81cGO6R6P/5ydtqJ10yxhjHE+ jGRA== X-Gm-Message-State: AAQBX9eU3tNlFwjcBg9fIORN6EB4ULJUejio2yALjljSOyiupsXi8+1E 2Y0QdMWdiaEMH6RKnxTjiscujPvKUSo= X-Received: by 2002:a05:6808:198d:b0:363:a5fd:9cd5 with SMTP id bj13-20020a056808198d00b00363a5fd9cd5mr107033oib.3.1681775994918; Mon, 17 Apr 2023 16:59:54 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id s16-20020a056808009000b0038ded2e4f05sm2222399oic.16.2023.04.17.16.59.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 16:59:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 20:59:37 -0300 Message-Id: <20230417235937.11038-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/pcm_rechunk_bsf: assert that in_pkt is empty after merging its data into out_pkt 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: Vo7CVDdgyAH8 If it's not empty here, then a leak would ocurr immediately after. Signed-off-by: James Almer --- libavcodec/pcm_rechunk_bsf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/pcm_rechunk_bsf.c b/libavcodec/pcm_rechunk_bsf.c index 032f914916..28b5722ac9 100644 --- a/libavcodec/pcm_rechunk_bsf.c +++ b/libavcodec/pcm_rechunk_bsf.c @@ -139,6 +139,7 @@ static int rechunk_filter(AVBSFContext *ctx, AVPacket *pkt) av_packet_move_ref(pkt, s->out_pkt); return send_packet(s, nb_samples, pkt); } + av_assert0(!s->in_pkt->size); } else if (s->in_pkt->size > data_size) { ret = av_packet_ref(pkt, s->in_pkt); if (ret < 0)