From patchwork Mon Mar 19 03:21:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 8035 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2173780jad; Sun, 18 Mar 2018 20:22:37 -0700 (PDT) X-Google-Smtp-Source: AG47ELs6n/jj82/eLIBAZNuMlJVja+73GOybfGOPvmUQCxdZI0Zswi+VbUtS4B733mt5vLPZlUPz X-Received: by 10.223.134.210 with SMTP id 18mr8743812wry.232.1521429757209; Sun, 18 Mar 2018 20:22:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521429757; cv=none; d=google.com; s=arc-20160816; b=EfLfAq9F9FHOByBGh488h+5PVDxhC0NOFsEC9sQs6fK+ZEAsdkOKbwaQtkAG2gwz4u oo1KbLNV7LvpP16mJXhArkktjUvVwfkkhs4fe329iYRc32n14gNOb6KtoyBChnryLVyp /WZjvABe1uGGJyWeu/gtefEDHzFPOmtWkgrBawbWqRCkxehuJySkyJCAUltQlfQ9ulxt Uc9fDYh6srlXPM8F3WCK6WesP67OciSfLGNJRQQoPXG77RAuUfG5/CdlU+PWXvQtwBfT HrUMebpVVYMe9AV/Epg4VrUmbkxOsvTSXqiIAlZzs46xf/o6Hbg6iMA8KfT9YxZkJjbl XfeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=90hpLpPm4HvR1UD/B15dsQUv33dHbJxBrXE/mvpnEjc=; b=uQFzJ12ENuSF40v9Dmou15Ds8ptMiKq5Sjfxnl9xTae0V+1KPr3hUUC5Dn9acZlO1u JUY0PfWOyH0iHRiLwlBFj3rr2EtKNarNqmfaXRoVg5a5eeIRMwYBLRpkkz/5dxbgDxxj BNwsIVJBQvK78hLuBvnfXNSaMS2if+PsuKt81Dd2fS4diMKszAUHXXSv//kmgTipMTw3 nRyjzWHAzCkffpSaL2IMustztjkqZaTIWmsMUp2Y99GdvANGIh3AeQvisu6+iqLUtHSS R1/cHjR1BKOH7WvFZbpnK4CrVl3oHbl38Y3zaS08F3NDi/BjdedhunaxbICqOoA97M+7 8WxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ZWn4rZhi; 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 b14si7726306wmi.82.2018.03.18.20.22.36; Sun, 18 Mar 2018 20:22:37 -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=20161025 header.b=ZWn4rZhi; 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 1EA9B689B17; Mon, 19 Mar 2018 05:22:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40CEE689811 for ; Mon, 19 Mar 2018 05:22:14 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id o184so16873340qkd.13 for ; Sun, 18 Mar 2018 20:22:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=HylrnNGHSBLJ3q4CnUqyIwzJTbmKRK+Qi1JXCZT37dQ=; b=ZWn4rZhioiFTyYXEsesQ9EbIElwTDAQwZleSmgbfXrMLZ+5+dAstGXEdZ0HQckukIS hrA2jXM9WE7BRWxgRdGEp5euOpGAjrL3j6k8tQn7REykmkuLvaRfHCtKj80s2PvUWXbo YVRp/Zf/PvxgQIa7ex/xpIxPxvDVJFy3OP1rZKc2xykKW+7kGJeLpyVs+OOpSvZNHMjO FsSVn5X6pB4hPSrZg9Cyh65/uNhjO5LdcmoIIpsnd9UpHBAsPrcQw5++8gvN0zFHPCUk /MN77XfFjWSq2aGIg8plte44WY4nAjQiJjRSjSvQa4XT2lr2cOZYjTFJBVY1ilkgGQTH lvcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=HylrnNGHSBLJ3q4CnUqyIwzJTbmKRK+Qi1JXCZT37dQ=; b=diWdcAUd9gng5ap9EOgFfUCSLvceImtb8vucSDcB2obs4RpRGC/CzUITv6M5MGIpjn UeVRdoGTLmBbFO+335YOibUZJT2Y40oZs6vTMtRpxygosWIhCRhVUTAklgdHfqIbG3KR /jWXDL2giS5nlgxw/1pXYAxxCun4uPk2g7EF3Paqk/y/H3iIEWr+GVmAPij5W2/KrXoG bPsUZ5sTPf5N5noSUm2MqvzNDRGNjKsLGlL3XURAZ+XfdO3g6SuMGIq+zloTSGz4apRB uA5i07V4mCy6/GkmPEkZ7o0TIysEsBikLdRNxJhPcPmIReTo16fcS/dbM7mXGQ/i9aBF 2JHg== X-Gm-Message-State: AElRT7FjpSSp1jFHNcVSRMJQ/wu7ZbrAwDu87ZRkDRoffPEAuJFu3A8R Elh3uSKrckjk9tJiZm4lTAlyng== X-Received: by 10.55.131.7 with SMTP id f7mr15798758qkd.348.1521429746471; Sun, 18 Mar 2018 20:22:26 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id f52sm1963136qtc.3.2018.03.18.20.22.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 20:22:26 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Mar 2018 00:21:19 -0300 Message-Id: <20180319032119.1276-1-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avcodec/mp3_header_decompress: don't free the user provided packet on error 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It's owned by the caller. Signed-off-by: James Almer --- libavcodec/mp3_header_decompress_bsf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c index 22c1ef0220..294858953c 100644 --- a/libavcodec/mp3_header_decompress_bsf.c +++ b/libavcodec/mp3_header_decompress_bsf.c @@ -87,7 +87,7 @@ static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out) goto fail; ret = av_packet_copy_props(out, in); if (ret < 0) { - av_packet_free(&out); + av_packet_unref(out); goto fail; } memcpy(out->data + frame_size - buf_size, buf, buf_size + AV_INPUT_BUFFER_PADDING_SIZE);