From patchwork Sat Jan 21 01:20:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Gutman X-Patchwork-Id: 40084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp1615804pzj; Fri, 20 Jan 2023 17:21:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXvo+qwr1fLVyiYjqcCM1D7/OrsZwN4HgGYr2WhKWUGFThWjaRUmkBa9qx7+4X+v0A5uJDz9 X-Received: by 2002:a17:906:cd1a:b0:85c:c4be:5704 with SMTP id oz26-20020a170906cd1a00b0085cc4be5704mr18210938ejb.22.1674264086870; Fri, 20 Jan 2023 17:21:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674264086; cv=none; d=google.com; s=arc-20160816; b=RILuFdOAdn3vJTVaPs2dK/3ovez9vPnTsUmqz1hnS89zHHDDjj+zKtTCeiui3uinz4 6faSLsIAdId7+C72C2bGGhk+yRylNtmziZ+wisbH/72dYlGcK1mtvY7fGQl8z3Ixz4Vj u2nk/I+r77vLU8qkOcYzFEMnIHE5Hj5IBUz9Y1rp+8rSUw2NJraPUb+U+F78cjbXurPm ZZ/5XHcie8ynfpjgyYroLm/pzMuh4R59JaaR0jN9yI2R1qzB7QfINZ2KuS9JfZyhZKVh dW47s1ziphukJ+9nTeYLodb38syqxoibB5fTrA5ozJ8bnr0mZhBfmRUMemMYYIkva7hR xH0A== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=iAlp/OxL2q+mqKSrg4oLa2DHypLmTXzs8yBZj+kz4Ng=; b=uB4xMXH9z6dY1LafxiHPWejh5k4nytvZkmIWTJJF+CmXt6yIYOLsX+KIFafefwYm+/ coZj+Ux4kyfxcocUQAYWnpzYPNisF7pevtAl8+Cx2N+b1LsAx/3uOIQaoBgOhCGdqHoZ mB5mMUfUq2ERY/zLJIUTOAB5mGfn99/YkiWYWIiF0joYR6cWsXPUXnCq9tSBYvLvOMn+ mkDvV+UaVHSC7MZvUBbg9poVXUduClv95MCk9bmq+ncg0jDfTx3RX5KtFYtN/nViGkyV 2hq6DU8Vwmq1S38LpT0Uf1r4LL8+KdG8JsO5QWdAHYfOTb5+ynPHor3oGkwAwHkxSzTO DLOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=bLcUvins; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gn7-20020a1709070d0700b008327270a7e0si50955426ejc.65.2023.01.20.17.21.13; Fri, 20 Jan 2023 17:21:26 -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=@gmail.com header.s=20210112 header.b=bLcUvins; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15B8C68BD48; Sat, 21 Jan 2023 03:21:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39F6168BD0F for ; Sat, 21 Jan 2023 03:21:03 +0200 (EET) Received: by mail-ot1-f41.google.com with SMTP id n24-20020a0568301e9800b006865671a9d5so4088599otr.6 for ; Fri, 20 Jan 2023 17:21:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xWHsMCYx/I0+8/Ml7oqLXQ1IO+AqB52l9BmbWoxVe0s=; b=bLcUvinsvEVSvJkHfuOsH1LIbk4fHOW0dgOQxZvxEwERLlYUbgfxWJkwCu1GnSqfZq GKVdYoBp8PEEXrok6CqG9XEZQLzrYssSv7yzO+nud1n68CvCeuV/2SeHo+1wJRejK+8J VO/oGsxWtSH1gk2FBCumD84B2Hsp5dQgiI0S6ppf1Hh9/l1xqgO1YbJZhCu95KTy/YSv vBeY3nnVEdspXTOXKVQYp+RiPgqe5iE7EiX5jksRMvsyw+UD7SrBgVuGzKw1KUSNLiAn 8wID2mD0ZYxOU15t+nNmZvao4c8c6/YTMLpYlk2VLmCXyDp1s6tX6TpWpjQz8Kp0gCUa sJzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xWHsMCYx/I0+8/Ml7oqLXQ1IO+AqB52l9BmbWoxVe0s=; b=MZRRSwkz+Zi4m504HHiBifJ609KTS4Z9fJobmXOjeKlWDEfhHY3ciy0vTtDT/CNxDw T/HesPw30cydnz/o5dVZmJZUkzv2AsVvw9A1pd58J9eSt0igN+zmyal3CsvxCuy6l5Xl TqKr1dfAgJyIqulKxROdG4W7cXtrZHcZ/j/TEhttB6hmgL5y5yl/EH+coH42YtP3yd76 uf8FzHUTFcbokMwwZIaWiR+pNkUI+eG6pRHGmrhextDjVPitjo0GtCX46oXgsxf4/fwi WVGqI+txWVOQ0QSFNsHoxgb9kUDFHxjZF9fJoFDKA71EniPEXUeHI8xeegN/29j5qXrJ OoHg== X-Gm-Message-State: AFqh2ko30S3hvpY3zxuq3I9bTHv39dsesJHRMxZeh3YQyMT6a7fOOr/a s5khBGPUtFXoSq+sk+ptdICWpITOXNU= X-Received: by 2002:a9d:6310:0:b0:686:5397:3388 with SMTP id q16-20020a9d6310000000b0068653973388mr7139749otk.37.1674264060946; Fri, 20 Jan 2023 17:21:00 -0800 (PST) Received: from localhost.localdomain ([2600:1700:4830:3f7f:c873:f470:4828:6b82]) by smtp.gmail.com with ESMTPSA id a2-20020a9d4702000000b006864ccdb053sm6336457otf.26.2023.01.20.17.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 17:21:00 -0800 (PST) From: Cameron Gutman To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Jan 2023 19:20:30 -0600 Message-Id: <20230121012030.1471-1-aicommander@gmail.com> X-Mailer: git-send-email 2.35.2.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/mfenc: fix double-free on init failure 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: Cameron Gutman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dBsip4qLYikQ mfenc sets FF_CODEC_CAP_INIT_CLEANUP, so calling mf_close() on failure inside mf_init() results in a double-free. Signed-off-by: Cameron Gutman --- libavcodec/mfenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index 36a6d8482d..f3415df10b 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -1214,7 +1214,6 @@ static int mf_init(AVCodecContext *avctx) return 0; } } - mf_close(avctx); return ret; }