From patchwork Sun Nov 20 06:49:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39349 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp1406602pzb; Sat, 19 Nov 2022 22:51:12 -0800 (PST) X-Google-Smtp-Source: AA0mqf6aAfW5t+MJi/mb+66ijQHkjFydujGAEojMhBM1M5iPOwRQ+jOG2aPTXDhBf+sGUtRc1O7Y X-Received: by 2002:a05:6402:170d:b0:467:69a4:afe1 with SMTP id y13-20020a056402170d00b0046769a4afe1mr12126001edu.332.1668927072415; Sat, 19 Nov 2022 22:51:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668927072; cv=none; d=google.com; s=arc-20160816; b=Py+Q2jsqL4dKytza9QLSkwLWX/2MfL9Q6dolf9zYneqCqJ/FbbC9IF58hCimyckP/t V732pGpUDzZzP38Nusgx46lbXKU8Tu2p3Iu9wvoWWZ5ACV4+bk9EGOdSGFQfukvfO2Cb QvnXb4bU+Im4tH2lLxFQrI3ZqFbN6AC/qi1YciwBF8R1rIA08ydYeokTEHK3HZUTxLZl 9PmbK0lh18evA3dr6YLcEg6U/CtpRWWSAjfckjRNzSt9udUQDuOPF0YsGUJtX6VTHPRH xNfhB3zfJl45ykexyNtbQE06GSQ8itumHJKOhqGTa4oP9YOqVKuM0DKmUF3xmpw7M5I7 HKrg== 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=92z76Ij5G63X7F0Tn0GhYUVvGzkrFKeC/6T+yhICzxo=; b=GjZF85KtWvfBc/jrB/iKpTMlSWQnJTa37PQJ+Lvwc/FI1dHFz/zcd5AUpjEAhcsrZq jbd1pG6gprFKpfQh5Pmw95/cfXPdlp12xoNRwFsW98hZ0LasQ+zfPNLa57B8H/cVLAki fuQ7AEp3vs989pYVoB6VLEK+8eDXE6rl5zTVowbILWi2W+1oSm4K9kHwsT3v62h6AMjA 9FrzBQKDIV7ik6lblULtdiPxYcgB87GL3ESenGDNNHiCoRJP7CJlKprk0FXFKifZDgJ6 NVciqJWBytwKg1PO2dhfrCTLBLlI5YsjCGzuSmX0sxZW2cReNPAINp4om9BI14CtAHM4 xKIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=tuHfhRxR; 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 nb11-20020a1709071c8b00b007a953d421bbsi6921032ejc.322.2022.11.19.22.51.12; Sat, 19 Nov 2022 22:51:12 -0800 (PST) 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=tuHfhRxR; 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 4D34D68BBDE; Sun, 20 Nov 2022 08:50:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D419E68BB60 for ; Sun, 20 Nov 2022 08:50:37 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1668927035; bh=lWOd2ji+O5MZTTmhLV+r38FAccPUJAd3JtM8g+orwP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tuHfhRxRgJv5z56TPdbODYvClevScOu56VRxxLo9bLxztgJm8I38jzv8c9dTs4x5K iXLZkD49VZxmBuTyrxmZBQGiGtEJWDeLrutePOVfJMJER1WlYrwMBghAxuk1MvIbPI abTTYoor8cY8iPAgwsgEbUboP7VL6XNDL6gnVXsU= Received: from localhost.localdomain ([14.153.77.200]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id C8F0626E; Sun, 20 Nov 2022 14:50:15 +0800 X-QQ-mid: xmsmtpt1668927034t8jpa3uwu Message-ID: X-QQ-XMAILINFO: MB5+LsFw85NobaPc+fVyy6Fy/vd+qavIA951ygM6PDWqiYh/3s6zQF5KwMVCiA goKlG5bchq4VfYfj0MOmJ2mb4M5p5L/T+exhRxi4+DVKDMggzD3nY2JvW8QqOhCpo9ZWbj3ntE6d OcWbjNbXtW3L+HCZSxFyYhJyaw3doXzr3sEMMU0AuMnEOoxYOUbctLTjPH8of+2UpKF2gnC/DNdz DAREAzWeQUpw46uG60i85XucWDhH2zuUYh0eNOpC8Ssi2FaGKU80oWpucMbrx2ePGSpGFj7OIBCi fL85/Y0HW6lNFRwtXkqMSxPGQJMT5VjaC/psycNSuWeNpaRQTDYdEm6hMicu3lvjcAQJ5almCwGe kfPJonBiBBksEJXvxtQXMmmXGnjT0KmZFrtJSzHSn592nLaICjNgpGyZs8kIIWN1+xE/UT0o+BHz RDjrNB7DUqRUfu60CPJppPbgSQGSopMN0Ipfqbclqhaq27WiI0JmgebsmeBkuNWHq6xPq+7wTOJY xGmNI7duES3d2nlEWWkew2Ds6LdQO8saslXUMmf2HOKhktd7Zgy+X+Mo28DESmzGyKNWNt5q9oEd YWw7yqRE+W7DUU2TLSaIwY1MPAFnowqiCUOLu4gHoY/8ihN7HpL4tjcbvzsT2nKzyyKrKcFQ8Da0 kbK6hhcOrcf3HEJCBXwYM86Kz8C2YZzyowslK/0BHF8Hr63/5x6FvlM6FyBVllDCwUnOsR3OAfhh KZpdeOsNkAp3af8afEMlk/Vy9wHJvOnvmtj4zP4X3VlzhXUBnyv0gj1vJGeLSPncJRroD5BZmZQx aKzdiMGN9UtgUTPDhzWmZF6n5eg8KFReCtlrBOzd89cvFMmaqf3eeQREju93Ddh20RpWAwDatPjZ m8j4gQWHfUDh6ut+hQDHXQH4EpQdnRGFkEUqZaCu0LBTPyxdO8OF07bn0Uc2XEnNFzu7STalH0Vt kHMWVTDA10Az5LjRyFoE7esIFg7+iVe2KnLpz1EyNCtMP99qvNm7eOuTXztEgdRCcGWtWVuk4= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Nov 2022 14:49:39 +0800 X-OQ-MSGID: <20221120064947.94540-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120064947.94540-1-quinkblack@foxmail.com> References: <20221120064947.94540-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: VpOglDeljTIX 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 4c48b9142e..69a462ec48 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");