From patchwork Sat Jun 25 03:04:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 36418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp690903pzh; Fri, 24 Jun 2022 20:05:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uz4Z2XgZp6GdlFmDDH87fOt+s1NjalWxpxxfNAcoT0pLLouLJxQ2v/3jRF+ykkVF2y9+Je X-Received: by 2002:a05:6402:51c7:b0:42d:f4ea:c09 with SMTP id r7-20020a05640251c700b0042df4ea0c09mr2680361edd.319.1656126324227; Fri, 24 Jun 2022 20:05:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656126324; cv=none; d=google.com; s=arc-20160816; b=C0Ln6R81Fp/Srf7j+I//yFVLbCQiKcnL4emWnjoP/zTDa1XpEfdJ9WrC7Mr3BVHkLP 0Xpx96vGNdxC6h/Sy9pADWM/JFNwLWs8UskMGzw02rvBkO2wJmfzYLAhWwqMscpDDFRC j7q+7HF91c+h93Kr7a2i3+98UNdT5pfzDCdRtk4wDLD9B9VabElwdDS0DNkVuyC41UMD gGakGt6z/xGZGyf4IFTk9MUiP6yNGoZx5whGmZL8QxGlZny2kROt2LG/N0xyLGHwfwgw waNi/DF+9cWdtOgMWqqQQv7KMmhyrDVHSVfM3kEvSP8UvqTMbdRiuTAMxbNJRgrDbnwR M8Sg== 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:content-language:accept-language :message-id:date:thread-index:thread-topic:to:from:delivered-to; bh=WuEhPx/5eWCIr2vtHb4GkBff3mU0ziufBEZqME5YVeU=; b=wgHR8lIsskKGP4a7Pp9XI4TbSg10bRJkxaVHu/dHI4LSOH9hzC0aGlieZGtG91gNo/ iZnD/8QJBF761njGi5T9s+XGdJZNfJ2t0xsWAbhsRKfoM+v5vypsTnYW8dGDiiGIsNFa NsjT6txBaVs5xR6r6jPoPMXSImxNm3O/j7/W1IaSA2ASdfJQzF/U1uWmS73cS+M/TRzA ymADq3v7HrnCnXi8BAYJxIcdihY0MqrPEFrezy/dA3RJ84Jt6ODba9SWQ1Wc87wgakIu OjUfPuql7WgmAb69A72yRwOL9si5zu1MIYoYXWM7TtFvb2B4kDTUG/QATmF7vtATU6SR Y77w== ARC-Authentication-Results: i=1; mx.google.com; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m15-20020a50998f000000b0042fdd010957si4522404edb.323.2022.06.24.20.05.23; Fri, 24 Jun 2022 20:05:24 -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; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C9FE68B6F1; Sat, 25 Jun 2022 06:05:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61CA268B737 for ; Sat, 25 Jun 2022 06:05:14 +0300 (EEST) Received: from kwepemi100011.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LVJhf4WMjzkWXD for ; Sat, 25 Jun 2022 11:03:14 +0800 (CST) Received: from kwepemi500014.china.huawei.com (7.221.188.232) by kwepemi100011.china.huawei.com (7.221.188.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 25 Jun 2022 11:04:59 +0800 Received: from kwepemi500014.china.huawei.com ([7.221.188.232]) by kwepemi500014.china.huawei.com ([7.221.188.232]) with mapi id 15.01.2375.024; Sat, 25 Jun 2022 11:04:59 +0800 From: "Wujian(Chin)" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] avcodec/v4l2_m2m: close the invalid file descriptor -1 in function v4l2_m2m_destroy_context Thread-Index: AdiAqRmVWB2dN8IqReOFFRVfmt654QHlv0HQ Date: Sat, 25 Jun 2022 03:04:59 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.136.102.143] MIME-Version: 1.0 X-CFilter-Loop: Reflected Subject: [FFmpeg-devel] =?eucgb2312_cn?b?tPC4tDogW1BBVENIXSAgYXZjb2RlYy92NGwyX20y?= =?eucgb2312_cn?b?bTogY2xvc2UgdGhlIGludmFsaWQgZmlsZSBkZXNjcmlwdG9yIC0xIGluIGZ1bmN0?= =?eucgb2312_cn?b?aW9uIHY0bDJfbTJtX2Rlc3Ryb3lfY29udGV4dA==?= 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: xa0yWMMYWLOP Hi: Please review it. Thks! -----邮件原件----- 发件人: Wujian(Chin) 发送时间: 2022年6月15日 19:15 收件人: 'ffmpeg-devel@ffmpeg.org' 主题: [PATCH] avcodec/v4l2_m2m: close the invalid file descriptor -1 in function v4l2_m2m_destroy_context Signed-off-by: wujian_nanjing --- libavcodec/v4l2_m2m.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index 51932ba..4427b48 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -251,7 +251,9 @@ static void v4l2_m2m_destroy_context(void *opaque, uint8_t *context) ff_v4l2_context_release(&s->capture); sem_destroy(&s->refsync); - close(s->fd); + if (s->fd >= 0) + close(s->fd); + av_frame_unref(s->frame); av_frame_free(&s->frame); av_packet_unref(&s->buf_pkt);