From patchwork Fri Nov 27 01:02:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24082 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 88A3444BB5D for ; Fri, 27 Nov 2020 03:11:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5181968BBCE; Fri, 27 Nov 2020 03:07:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6304968BB37 for ; Fri, 27 Nov 2020 03:07:16 +0200 (EET) Received: by mail-wr1-f49.google.com with SMTP id r3so3967869wrt.2 for ; Thu, 26 Nov 2020 17:07:16 -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=NzM1OuwlQxjg5tNaX6d2tyWi4Qj+0PzAIAMDeReYE2A=; b=OLCLTnUASEfaEKcnrUm1r8JPpJMw2UKXslD4BvDymIPX5O0/RufQrJHNhZzrcWeYtW gn60bdeD9204CJc9GXD9gDpYbYeKZIpdrtMbHdBglUYRlbPZby0BhQLMtUXqR1kx3RpR RXV+YCRjVXnwyO8iKA9py1tynU9+kHhCczpuqj5B8RdEEYhparDagrg3rpZAdEulIN5d GPQnHZQ2qooGuiv0zEdsV3dmzRSahvWOQYfO5txiSR12g6xTu1z7OrkkiTQI1eULHmEn fR4j0fL68i68dMfTDqiesdpcv5vdlEPr9DuEijV730AdIQ/M7FWTaTAR6C6owAxXc6+3 j6Ng== 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=NzM1OuwlQxjg5tNaX6d2tyWi4Qj+0PzAIAMDeReYE2A=; b=nA5DGX3zDcRUthYjjjiljiacocQhisepxgbIKFKHshENC7XiHr/8w+p4JEvHBJWnPh opP3xGc5OnqOi9jF3k4QDBJ3v5isyRC+nL5BB+y26ZBrmrn4LpF1P7D1DHYte+wZ27IA V6z3vKO5zcPkKsPibDWxrMI8JS8jr1hvk4KPOleclE2+9J0i+szDGg0++7AEL9NgR+52 vSQwVOh1kVufHWnr820j9nOPoxmiIU2ABTgXNeTmq+qQDRXYGeRfy2o3zgRa8k0gxfTO nB2HKnKujTOC8aYuN5gn9lWurylBpRFp1g/wsP313ILUWqeuwr8q4jnyVOrBFQ6EYGa5 4gZA== X-Gm-Message-State: AOAM5323QXuCQkOE42XNpV+jywPPNMZlJtZP+/2xlnFIY/4u/kwedpzV ff9FgGxvRs4ldS5a5zMK4Cn59Q28pHgqqA== X-Google-Smtp-Source: ABdhPJzFXIXD6tVS6FLhftEzBP28OnFoOeHFwJO3nHWzVki4B9zlXfv7oVCG1aHIBfAmne3T+8i+Ww== X-Received: by 2002:adf:f602:: with SMTP id t2mr7219155wrp.40.1606439235581; Thu, 26 Nov 2020 17:07:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 17:07:15 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 02:02:39 +0100 Message-Id: <20201127010249.2724610-35-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 35/45] avcodec/mjpegdec: Fix memleak 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" This affected all decoders that used ff_mjpeg_decode_init() as init function; and it also affected decoders that open jpeg decoders via ff_codec_open2_recursive() as well as MxPEG. Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeglsdec.c | 2 +- libavcodec/mjpegbdec.c | 2 +- libavcodec/mjpegdec.c | 4 ++-- libavcodec/sp5xdec.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index 0b1e139048..1db6faa99c 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -553,5 +553,5 @@ AVCodec ff_jpegls_decoder = { .close = ff_mjpeg_decode_end, .decode = ff_mjpeg_decode_frame, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/mjpegbdec.c b/libavcodec/mjpegbdec.c index 70ff4cf563..7666674908 100644 --- a/libavcodec/mjpegbdec.c +++ b/libavcodec/mjpegbdec.c @@ -163,5 +163,5 @@ AVCodec ff_mjpegb_decoder = { .decode = mjpegb_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, }; diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 147dd819e5..6cf8014490 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2888,7 +2888,7 @@ AVCodec ff_mjpeg_decoder = { .max_lowres = 3, .priv_class = &mjpegdec_class, .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .hw_configs = (const AVCodecHWConfigInternal*[]) { #if CONFIG_MJPEG_NVDEC_HWACCEL @@ -2914,6 +2914,6 @@ AVCodec ff_thp_decoder = { .flush = decode_flush, .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, }; #endif diff --git a/libavcodec/sp5xdec.c b/libavcodec/sp5xdec.c index 815f9ad50e..ad2e9b11a9 100644 --- a/libavcodec/sp5xdec.c +++ b/libavcodec/sp5xdec.c @@ -106,7 +106,7 @@ AVCodec ff_sp5x_decoder = { .decode = sp5x_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, }; #endif #if CONFIG_AMV_DECODER @@ -121,6 +121,6 @@ AVCodec ff_amv_decoder = { .decode = sp5x_decode_frame, .max_lowres = 3, .capabilities = AV_CODEC_CAP_DR1, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; #endif