From patchwork Sat May 23 10:44:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19815 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 E9DB1449078 for ; Sat, 23 May 2020 13:44:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D31F768A0D1; Sat, 23 May 2020 13:44:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3857689256 for ; Sat, 23 May 2020 13:44:44 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id u12so7632113wmd.3 for ; Sat, 23 May 2020 03:44:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X+YxDg121XBiCN8sorbQHrjcyVl02OdEnOnqIkcoSD0=; b=gQ897wmdgyJy8pT+lCpJstr8D8b8MJLTT7CAB1lw++VVL8Qfls62L2UjPEfbJlbziO x394eYkHvdoEKTulTYCklGvsui+uDmbqJC5VXNyGpXPZm/DGGlc4l53h6WDmoKclMQCH PcJkCP/w4mHARoOqw48Nulbppm3qa8dzhh9ssnIMjG3qGFEU2mvDd7GP3w/0lF2xmfOI 6/Y/LJv4/xsXQ4SVRivM7yF1HIYC2wC4lahBPWxUROgc7SQkN1hrr68rv8Hbp0zKlKXE PSoVHabWdU6vj+eBIkHsJf1a2cO80z/OKpb9yfiiTflR8ErQFe2SsIyEK6xslAOMB/pJ ja9A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=X+YxDg121XBiCN8sorbQHrjcyVl02OdEnOnqIkcoSD0=; b=Jwhf/Z4ud4/vSMyOZ+HNubCIh8M9URbpxDZeVVjT6n/QSXGWq1XVYDSGzrs+FVx1EW D8DDP+nDKTY89s60bEznFQ0q6JPuhIeA+4LrqnXxC9Z5OxqMR3SuGGlDd2C4vuyzGZ2V 2tZEWWkv9pXcY5OdXno47k/tKBuu4hMP2dgDUJrybpLitTk5EGJNOHbSxD+J37D3BeAw Kj/H/Cj/XrNz2Yes1kgIbgTHtz/LJO2b3K6Urz7ZC9PUYeyQ0oKP7LBrq239OYxyLIJo ZvYZ+tw8Xn3eMji2RlJcBYH9neIBzG4Z5DUFfxR2rDyEIj04I2H3Z2xeogtCfJcFL5p2 zr7Q== X-Gm-Message-State: AOAM531XqLUWvUiLBPOeALa2ZpoMvAQ/2pHyDv52+a3Ha9hGHkUBbD6z YS189afQSXEVyk/+bYtz5GEGfviU X-Google-Smtp-Source: ABdhPJxl3kvY35Tl/2GF/lTODFx5K0BFtR1rNWJWyLrlswlPjbBhyB+tcdVXG2GfdooES/1VZC7mYA== X-Received: by 2002:a1c:6784:: with SMTP id b126mr11697277wmc.80.1590230684179; Sat, 23 May 2020 03:44:44 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id r6sm15465455wmh.1.2020.05.23.03.44.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2020 03:44:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 May 2020 12:44:12 +0200 Message-Id: <20200523104413.10023-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200523104413.10023-1-andreas.rheinhardt@gmail.com> References: <20200523104413.10023-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] libavcodec/libmp3lame: Don't free user-provided AVPacket 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/libmp3lame.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index ecdd2e334c..2beb28e569 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -279,7 +279,6 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if ((discard_padding < avctx->frame_size) != (avpkt->duration > 0)) { av_log(avctx, AV_LOG_ERROR, "discard padding overflow\n"); av_packet_unref(avpkt); - av_free(avpkt); return AVERROR(EINVAL); } if ((!s->delay_sent && avctx->initial_padding > 0) || discard_padding > 0) { @@ -288,7 +287,6 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, 10); if(!side_data) { av_packet_unref(avpkt); - av_free(avpkt); return AVERROR(ENOMEM); } if (!s->delay_sent) {