From patchwork Mon Oct 24 03:16:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 38940 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1997786pzb; Sun, 23 Oct 2022 20:18:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7pHrO5O4a7XF4dCfOfaYbUOrhW640YZjavB7Kr+DhibW9UsYn/d/YIIknc5+IhZlMXa/Py X-Received: by 2002:aa7:dc06:0:b0:461:b683:5fba with SMTP id b6-20020aa7dc06000000b00461b6835fbamr4165674edu.72.1666581484591; Sun, 23 Oct 2022 20:18:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666581484; cv=none; d=google.com; s=arc-20160816; b=oF9KJGt8xKV3s0xdZyYTxoIA5sspCsnKaW5dab89ZucjGuB7RcZHxHPSaSK8fImXK8 d706kTV2JkLVYUkwc5+aWAB0FPyzYh8ereLUoBwyoQkBFWsV+d6yNUmHMykjLxhoDb0o 79uDKjCGnvcVKDp3Had9qTCrrkOrQN+kSEE62DKMr0pWgxHCOc34NsMJLQnjboglTuSt SAiGHnFFzJMkJ57G3anGxEgUzL0ZyYhq5NSxKoZZEcNDyb+IePNyHRq9HW37zRFthnKq 9U7XuRZsijuw0qfz7wiIr1ucP7UPFaLXJvU3/Z381IH5nJaxh1SqO7Gk/1+vHjsr3d1D +GLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=ZCIsuZXAwpUxCBB8equlyeCOyasnD/zzNDSBWqqvlE4=; b=Ll9LDB2LbDoMgPrcYGeE4wY0jJIOkxdNG0AguDVAulxSHL9bAoNoY9adKBg4frL/pw 7HJEtGu3RST/IxVEm0Klg+zlbFZHN7C/HRtw67P8Uhz3YeRlM9VLuBtKA+6f00JS+N7E 0Os0T1/Hd8VUKUB5KAC9rT9PooTqd/a/13iAaUgFcvo7ABjnvGWkJmXGBlZMbxK9U6Xi NHQ8qn3B6EkyQwd6UqaEbc+BkwQtkzgzXQKuyAacMP1jDzX/PsjrTvbG+r/h5Ld6EnxD DL5MQBkgrtH4/Piw1zII5/yVeMe8kkDqhQVgeHK5OgCmYpgtu9twJljKkgZu1A3uQKUR 7lFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="Lasr/X6t"; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n5-20020a170906700500b0077fc66b581esi21316788ejj.688.2022.10.23.20.18.03; Sun, 23 Oct 2022 20:18:04 -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=@foxmail.com header.s=s201512 header.b="Lasr/X6t"; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1511D68BB88; Mon, 24 Oct 2022 06:17:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CC3368BBAF for ; Mon, 24 Oct 2022 06:17:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1666581438; bh=zbi3i38HK7poIMQV1NZti2antgNBIWsM3d5p+oMlt10=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Lasr/X6tEOplXZxeu/IMiyDY/ab7Z0olCLFMqnwOC5vs9o/n91n7dRSt3/0U6Ij7V htaQeAvuW4YhN8YoQmTHjMOOkwUTrcFZLNxCiXnabx603/LhWPPYFE5KeI0JOvUCd0 6KcUKN0Ntr+kxlAdlIBaAd2MyG1c5sywdfi0lxF8= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrsza31.qq.com (NewEsmtp) with SMTP id 44A14270; Mon, 24 Oct 2022 11:17:10 +0800 X-QQ-mid: xmsmtpt1666581436tli4h3e64 Message-ID: X-QQ-XMAILINFO: OKkKo7I1HxIeXAfR8K6M/P3vsbJUCrBqPiClHUaV/2n6XhVVkZ+chBj3hWMEcI BfwjBzSnyuoqLet56MnEyRV3uOnxHx1/lPeaa9bS1XnjWPoFNm5ELUgEzsV9Ccf5CTdpIFqV5JOW z76P7Qr342o88VuVsIB0sxHv1AYTqlOcSDfXOyaGZp1U1vcs8l30NbvX6YcoRXoBFXcx16Jxx+3f pW4dGNQaQa+XSKwhFQ5II7/b/e4G1niFQ/unmxdkTir4w1igtCc/QLJ8+Tz+tN1ogmBjs72XdXCQ 2FtkyNQWDApwQVQrdV+ajobngONyy8NqLRaxYMo4sPXiyXKWZwefx5Nw+LDjD8AIsWtJM2LI2xOA ldyLSiu4wqMyTsqcwD3qBtyADzcZuXh9FCqk3ylGU2hpmnpDv2MF4pB8UfL8nCm6YwTUr+JPSrZe p3SKJ4b8q97MqD2zogz1Xi0nu+MbzkoL+HeF6NNH7KGe71H7PNep/kF/YL4JiqJ6t7j4lpHWe/3O HQ7jGHrSwWId6O4dThr8NReUDanPTnz26anNFARA82rIdf9DJUaUYHuPiz/O526XaAvUqrPIY2f6 IPD4fS6JmLnNpDGJoUyEelxvy4mFYJdgb0Oliauc5Ej7mZshx7m8vkG+T8ojE5qJ2pJ/9NFym/z0 8Q3YVC+o0k8FoARxa6+qxIu2WAT0F+LC4yO/qMYZpCpF0+k81ALNIjeACx89TsdaAWQqW4/dE04N cTrcNVA6ccRg9CM/XnM6t0wkbGNKs9ovfCclRtT6+b6F+yCn3kPQIEI23Hfge8wpayi17eA2daxo zCTv0a4VJ4UGzrezeqlca1jvfu3DzNTScml4/Uospf5AXqCY5QIlp3IOcmtHMn5rpgKUZRwc5M4M KvVfakxgGt6+BIHQBJGaK4X3oY62z2K0/X9HwhcKi4reTLUtsFuT8EJ5Xz1+L66BKheCRPxkVHyL fVOwSy22y19Nrniqms7ITM5UiEf+vws28or5+nLng= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 11:16:50 +0800 X-OQ-MSGID: <20221024031658.1026118-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221024031658.1026118-1-quinkblack@foxmail.com> References: <20221024031658.1026118-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/12] avcodec/mediacodecdec_common: fix useless av_buffer_unref 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 Cc: matthieu.bouron@stupeflix.com, Zhao Zhili , aman@tmm1.net Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: G/azf4Jr03FZ From: Zhao Zhili Since frame->buf[0] is always NULL in this case, av_buffer_unref has no effect. If it's not NULL, double-free will happen. Signed-off-by: Zhao Zhili --- libavcodec/mediacodecdec_common.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index 940b4e02d5..d6ce709dd8 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -335,7 +335,6 @@ static int mediacodec_wrap_hw_buffer(AVCodecContext *avctx, return 0; fail: av_freep(&buffer); - av_buffer_unref(&frame->buf[0]); status = ff_AMediaCodec_releaseOutputBuffer(s->codec, index, 0); if (status < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to release output buffer\n");