From patchwork Tue Mar 10 04:55:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 18103 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C42B344B992 for ; Tue, 10 Mar 2020 07:24:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9FA4768A315; Tue, 10 Mar 2020 07:24:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B95F6687FA0 for ; Tue, 10 Mar 2020 07:23:56 +0200 (EET) Received: by mail-qv1-f67.google.com with SMTP id du17so4939793qvb.12 for ; Mon, 09 Mar 2020 22:23:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wSDw8D2jXXfkQTBDr6/wBdDCrb8VWf9iZcH0YYTEL/o=; b=dVBfTom2FWNUdE+nVs0kAvXyGJoSjPUXwPGECEgX1geB0X9GQsaXqJ91PbRRLNK7iq hh98v7rdpyOyzFWeVq+UfVYVX3lOIVZmnfuYqCOKUm9mi7qrAhoKrZJoo8ZLZpYODsUv K1pIzjvB4buQ6y6do/uEiXxTKalAnwPqnjM2ZPsME26t2kyUfOLxf2gPSgy7zeWUgqaO EiHhhQV7PvUKGy9OoHDGuRfx98dgBFTGSZBuzn2eud7ETUCMF0ISbUwcmx7+rw8jsgkj C/w0pKi2iIlJcF4AEQuvxi7pbujPgzKWiAw1g9563jpyB0ZwMNt6rXILzMuA36NBP8e8 hRRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wSDw8D2jXXfkQTBDr6/wBdDCrb8VWf9iZcH0YYTEL/o=; b=bHWkaYE2iYz1Z05kyoKe7wujvPZ0EU0Un1rRN902eAp6Fv+4ooXX1w/34HWjq+zAcg 2VnwuYWRJlrYceK+eIzSSMmOAwbLp4UpJjIrnF+k/hlEJ9kG01ob3RLoN0xjg60YM1mC YGBuB5L9avBhNsAQd/P3B4lByUs6LivId24Sb8LG6x16JPW2IZZ9OZP7hTZVTup7o/wS cSfq7sMxNs5fcNk2v1xnwIwPo8rYMQ/RQSlvetWr8Yrnd4yfQCTFu3+ruFX0kSZ0HslS NH3ef9Kws36Hgjg3lnob4Uj9Uejgl84/cvmi7TCfAneCCL9PMRxUq3k1iN/f0oWr/RtC 8oWw== X-Gm-Message-State: ANhLgQ0hRm2WqFZFyMOaoZRD3p53rKHdx5zNYDaCVMuYX6s40e7r8B79 48qlY2kseSVgCqjQAAEmcpL2GtXK X-Google-Smtp-Source: ADFU+vsurDjE7iuyIE8E291TwJjAUgpzk83BgQkolk08frcp5qXYYfm6c88KLGz4pfUs+CXJazdJ+A== X-Received: by 2002:a05:6214:90c:: with SMTP id dj12mr355171qvb.149.1583816162728; Mon, 09 Mar 2020 21:56:02 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id j1sm20500752qtd.66.2020.03.09.21.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 21:56:01 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Mar 2020 00:55:40 -0400 Message-Id: <20200310045541.13048-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/v4l2_m2m_enc: Fix leak when device init fails 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 Cc: Colin NG , Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Colin NG Fixes ticket #8285 Signed-off-by: Andriy Gelman --- This was sent to the mailing list by Colin NG some time ago, but was never applied. libavcodec/v4l2_m2m_enc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index c9f1741bfd0..ff9ff267ea2 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -316,6 +316,7 @@ static av_cold int v4l2_encode_init(AVCodecContext *avctx) ret = ff_v4l2_m2m_codec_init(priv); if (ret) { av_log(avctx, AV_LOG_ERROR, "can't configure encoder\n"); + ff_v4l2_m2m_codec_end(priv); return ret; }