From patchwork Wed Jun 15 11:14:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wujian(Chin)" X-Patchwork-Id: 36238 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp297227pzb; Wed, 15 Jun 2022 04:14:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymuCnYsvQezxHrA6Ve02aGH9G2LV+JrlltekihMfB6M98sWKRgeuTu8+jgxCQ0I164ceSw X-Received: by 2002:a17:906:c01:b0:711:917c:4c58 with SMTP id s1-20020a1709060c0100b00711917c4c58mr8649757ejf.291.1655291696107; Wed, 15 Jun 2022 04:14:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655291696; cv=none; d=google.com; s=arc-20160816; b=WgYNcZAMzJEVKhY2/OoKsOhs0frARmnZLd1v64EyTG2Neh8CeWjK+NTAYOssTGjIvD Hm+SOBpg8R9XO20t5Ed3KX0TkdsfunDtMfr3iaxa+czOCAbzT/J+4rbFVgM0Taa3YJcC MWMKxbP5JFRGz0MN1UQ+EMJDRmHutF21+5rzf9X3naASB0B/ZyWCtuSWe75nO6EEZZGo ZesiljXS6MEc6xcypMp3a7pxNoNBu7PbfYrmtQqxnIkttH8Ur5DafRibSqdIo8A76DyH bGxvv0XMtzqTHyisDRoTiu1EYJQ7e05fveMSgxUpaCiPctUlPrJv1xkT05w3Yab9cyLZ LIlw== 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=NlzDJfyPb1WqcKVWQQSeKbk1YR9L7yt7rDLz/At2kE4=; b=C7DkhFBbYlsHjNfzOjc1WHW2WOGJOIXZl4EqEOHXhtc+hJ6kcuN2m7sb7cJHNvbIZH 0Rh0Uzuax6qYWYnLIe4JFh234tWGGN38R8rTUIqtJJl9sN9bjTvY1C43WJ6irL0kzrFr p7ifH1s9tHakvH313wYFCn0uZe5eApfEZlnjNIsf1Uf+40kIRQ45qP4gP1IOc2UGXRaZ Ys572tZ774y7JS4vYxg4pv1WaC/rok4SEyIYIlSSBaTVja2PUto7OlMhd9aAZo2Xhq7W efu/0vLlx4+fFC53TOhxtPx3Czia+nLb7bCVfrfTD/IJGPhTJ9ocHO0E3k7Y62OWaj2+ ELqg== 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 g15-20020a1709065d0f00b007103c7570ecsi15237697ejt.188.2022.06.15.04.14.55; Wed, 15 Jun 2022 04:14:56 -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 F128168B6AB; Wed, 15 Jun 2022 14:14:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E54DC68B634 for ; Wed, 15 Jun 2022 14:14:43 +0300 (EEST) Received: from kwepemi500011.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4LNN3n70P8zDrDv for ; Wed, 15 Jun 2022 19:14:13 +0800 (CST) Received: from kwepemi500014.china.huawei.com (7.221.188.232) by kwepemi500011.china.huawei.com (7.221.188.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 15 Jun 2022 19:14:39 +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; Wed, 15 Jun 2022 19:14:39 +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: AdiAqRmVWB2dN8IqReOFFRVfmt654Q== Date: Wed, 15 Jun 2022 11:14:39 +0000 Message-ID: <2b4ec179fae54553875f12565be24a88@huawei.com> 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] [PATCH] avcodec/v4l2_m2m: close the invalid file descriptor -1 in function v4l2_m2m_destroy_context 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: v4WTICw+id2T Signed-off-by: wujian_nanjing --- libavcodec/v4l2_m2m.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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);