From patchwork Fri Nov 27 01:02:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24081 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 40D7444BB5D for ; Fri, 27 Nov 2020 03:11:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02B0C68BBBC; Fri, 27 Nov 2020 03:07:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7210968BAC8 for ; Fri, 27 Nov 2020 03:07:14 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id z7so3952608wrn.3 for ; Thu, 26 Nov 2020 17:07:14 -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=ZAkeaipqgeAIYXZRJ+kkn5paffrXP9faFKEWa5V4ado=; b=V3Nl9yc8yFIYCUdhNPjrD99Wgxf41Y4XLg/TRVVIMlMKTk2I7bLyWywXPQs26l/J4u sYn1P6/8x4fjThCxQ5KpVC3B5V7dv+QKpmG4UZh9dKG6osCQaZwNc0uQNV8d9q//VYUZ wQrkL48dC1WJcPAm1HSERmiDMtakQrBogjSr+xls35y7gMZbcdslDmSd5YKeAFAU7fS0 dJE8WbcCj37NUEGdmOnNd9kl0VheK4vPkjnrtvhpWy8u0T5P0JayYCOM7k57B+jxXjp6 GAm3gmMYh6kY4lw+j3SjYc+XAxrF8rtWro5HxQl9rCnn2ZnEA13EzOEnJoTI78yXeNJR wQag== 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=ZAkeaipqgeAIYXZRJ+kkn5paffrXP9faFKEWa5V4ado=; b=NYInY60bhbMxKOgqjAbo1mCDPbGDjH96SyLT0kH7DWBrPlDSM9Q773weHaUibzKjKq ZKA4Hp4IxZgFKz918ukmuqlxKQuCZqoaK7+P/mr5lRw21mlRk4c/DnNxtQCIVF8+nREV kUoKW+x5Hh4HgemSgQ/yNykpAJRBGTooFGAk2lARYaMRYgCa6if2S9buBQUtUuwAOSAF etK6Gz9L2OluhaGhfbT/5m1XFIvdJuthXvx9+Tayjjo9fwxBasBUi7xxa8r/7L9PbmFI B4CCdggst++NOrC+xVDGue/Rz0/zhtCAKvGmr0QRrq5I4Uyy4DXT4ucBojPXGrRtmll0 TwGg== X-Gm-Message-State: AOAM530kDv1mlXAbJuR5lifRMpS66oWTpt1zWT6NuYPqz8SWOi/xDs2S Ti7TSQbqidRLZz5vHaMPdTxVBdYBM3DYDA== X-Google-Smtp-Source: ABdhPJxmHgNgmnylrqVbtpLCljUncenGvGBYO08qryxqxtLdiG6ozi4A1AauGe1QWM+QRZwpZk8lNQ== X-Received: by 2002:a5d:6744:: with SMTP id l4mr7051535wrw.378.1606439233862; Thu, 26 Nov 2020 17:07:13 -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.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 17:07:13 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 02:02:37 +0100 Message-Id: <20201127010249.2724610-33-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 33/45] avcodec/smvjpegdec: Check allocation for success 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/smvjpegdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 587ad82a00..32756b54f3 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -120,6 +120,10 @@ static av_cold int smvjpeg_decode_init(AVCodecContext *avctx) } s->avctx = avcodec_alloc_context3(codec); + if (!s->avctx) { + smvjpeg_decode_end(avctx); + return AVERROR(ENOMEM); + } av_dict_set(&thread_opt, "threads", "1", 0); s->avctx->refcounted_frames = 1;