From patchwork Fri Nov 27 01:02:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24084 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 C403F44BB5D for ; Fri, 27 Nov 2020 03:11:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2586E68BBD6; Fri, 27 Nov 2020 03:07:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EE6668BB47 for ; Fri, 27 Nov 2020 03:07:17 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id x22so3643355wmc.5 for ; Thu, 26 Nov 2020 17:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P/YBP+Zg6K/mQqGwQYJ+CMNOTalsKDzzkP9tXU3MUWM=; b=omwc29qJZ4Qk412bdI3tzt6Z1ZPJuqmfRn34l6A6pi77eOBZVLYx4cTzUs52p3awBz Yuj7fqcSeCI1a8ADIeluk8LLUBw/H4WYEAUSh4Y4e9ap81dOvWsAC4XAobG+15IJPRmd 9sbs/Y1IHPu4mJDhFa3Thwl2STIkZEBbSkz4l6L38B00rlRZd9sDMIirgKvdPmlbFgxg iWeCVEPiUglrbrMdKYoGt68rOPSTinWKawDzPbBcxu0Ej4t+tc3TziyrqyDuW6e7ScF/ SEK+iOYLiuMZXKamrjVd87nU+RJE4Ayk7zJRPbVYX9yy+Kip6FCObIuzp8R+WCYVJZ4v n9mg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=P/YBP+Zg6K/mQqGwQYJ+CMNOTalsKDzzkP9tXU3MUWM=; b=sXP/bmaM/ugNqfhYK1xboNlIAQqFaqk3kjTfhvvpmQjbn8j3hxCZQHdNxXHuPmSAey 4H8AL2WI0Ib9kyNVQTDemKaj3A5VUet2n4IP/m9iQXSZvx5waXKTio0c1OCe+2Dib49V Bo3ZEbtfpw5YV0+OBIay2NEti6ZmBCp319UXzDVXN/OZN55GhUnDau1cX8Eq5v++8mqD Lq3d9eLrid20a/f5R7NimpGLAflpeyMiZrwCOAMRtCyCNxq3K1GBtX7LCRQrPCn4zyEM pUmu4IdV9pfWHEqvBrXPmsiWAIgyBJ1oheZF/i5Vrlwh3X1J5lUeIh4YK7HXvl03BMQd mAcA== X-Gm-Message-State: AOAM531uHqoDZWVRREyfSWnbPD7WzDzg6jWPFu6tAMlncOlcbV2VezFz LlIIIvRby+xqMevN4AAaK2ihtXFozq4/8A== X-Google-Smtp-Source: ABdhPJzi2bWoqAv7SsE9Lzmq/+mmrku6exIKViK2nXtRaYXJfOw2NBJM2757kqog6t/7rLKNLti0gg== X-Received: by 2002:a05:600c:2512:: with SMTP id d18mr6235153wma.153.1606439236558; Thu, 26 Nov 2020 17:07:16 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l8sm10504450wro.46.2020.11.26.17.07.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 17:07:16 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 02:02:40 +0100 Message-Id: <20201127010249.2724610-36-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 36/45] avcodec/mxpegdec: Fix memleaks upon init failure 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 2 ++ libavcodec/mxpegdec.c | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 6cf8014490..c2d946752e 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2815,6 +2815,8 @@ the_end_no_picture: return buf_ptr - buf; } +/* mxpeg may call the following function (with a blank MJpegDecodeContext) + * even without having called ff_mjpeg_decode_init(). */ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) { MJpegDecodeContext *s = avctx->priv_data; diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c index 55ec6e928e..725e435118 100644 --- a/libavcodec/mxpegdec.c +++ b/libavcodec/mxpegdec.c @@ -67,10 +67,8 @@ static av_cold int mxpeg_decode_init(AVCodecContext *avctx) s->picture[0] = av_frame_alloc(); s->picture[1] = av_frame_alloc(); - if (!s->picture[0] || !s->picture[1]) { - mxpeg_decode_end(avctx); + if (!s->picture[0] || !s->picture[1]) return AVERROR(ENOMEM); - } s->jpg.picture_ptr = s->picture[0]; return ff_mjpeg_decode_init(avctx); @@ -351,5 +349,5 @@ AVCodec ff_mxpeg_decoder = { .decode = mxpeg_decode_frame, .capabilities = AV_CODEC_CAP_DR1, .max_lowres = 3, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, };