From patchwork Thu Jul 8 10:40:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28865 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp323444ios; Thu, 8 Jul 2021 03:46:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRjyRfEe9LK1fj/ctIwR+XTGsUzrKDQBtKoXDUSsXcIKUHmQ+aGOtJboealPtrC7cSS4j9 X-Received: by 2002:a05:6402:4311:: with SMTP id m17mr18590654edc.346.1625741217144; Thu, 08 Jul 2021 03:46:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625741217; cv=none; d=google.com; s=arc-20160816; b=AljeiKn4Z52VlvRX6hTNdwgXpcjdW+1z2zql6R6S44vqOaOyEwpzabv/O75U0jt7RF BmPHR+yibdagykAHs5cqxkzbEwDnEEQ2mrfAolVXBHUllOgM5fdiLMF2kvcJn/7+fB+e tAkp7H/ww9w+4zxrAuK6DMtY2MBXNBhd+PCgniSD/EP7RbsfJDxAS13P/SCReaS5Nybj bFUOLTPjstNalJoI53GoaA12OlATNvtVR2zhQ0S6TSnvXiCdHw3ZbTen2GR/3VLh/r4o dUqyiHRMoUbsOJ6xiwAn15ghxG/LP7fvv54uWoKDGFOacWJuLRO/MysImUGKThHJbFHQ 7P4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=B3qgyex51oPLUjTmQ81bHLabQ8hXWXZBGeYTD9IfjaE=; b=CVe+Q8tVswGFYPB5j1ZMAsnKCt+eU/rW7KVGpGzYqcXqRtL78dIL+CKNbXFdUJiuPJ U8bwS+I3jk9r7owRXJF3y7/erXOZoACkvj9Xr0RVupto1Ewt4HhCOsiJ8xxbym4ttQWC aQhOVEZ8Qk4FE1KLiJV+I3Douy3qECRrQttm7WrANy4i4uD+l9SHEhMcVdViHeFSygms ja2e7SR6E2wiOuf91JwPFjZTKuw+60r4WiFeytE2/MKEBQqZBR73sZqccRO7tExw0sXw aMLbuHiOYG7TY4mnZLPxsTFxM8woWs0IsJ3L0KhU3aJG95psR8kg5vIRHLvY5k933Gbd Yj/g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m7si2507951edd.505.2021.07.08.03.46.56; Thu, 08 Jul 2021 03:46:57 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E12E068A808; Thu, 8 Jul 2021 13:46:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CD0668A15D for ; Thu, 8 Jul 2021 13:46:47 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m1RTD-004S7H-09 for ffmpeg-devel@ffmpeg.org; Thu, 08 Jul 2021 12:41:27 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 1RSEmBWO4ljeH1RSEmID3l; Thu, 08 Jul 2021 12:40:27 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=sC9zskrJIYATsxHFB2QA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 8 Jul 2021 12:40:26 +0200 Message-Id: <20210708104026.23123-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfAZGs5sARD6PWiA+GT5xYGcuXLRN9Gj5oLCaUiqgbpUeG9dWZkHbGDFvgTHbNqMyu/JqKbP0E8zDP7P97RjoTOd8CGDoCCVDMaxb5r414tBQAD7l1fno 2ZPCwvsHULN1e/CitcTWtf1VoOHuVdelC1s/aj/NtQPtSO5dRwXVdf6v Subject: [FFmpeg-devel] [PATCH] swscale/slice: Check slice for allocation 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fqIWRyNrqy/A Fixes: null pointer dereference Fixes: alloc_slice.mp4 Found-by: Rafael Dutra Signed-off-by: Michael Niedermayer --- libswscale/slice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libswscale/slice.c b/libswscale/slice.c index d96db13364..68517da00b 100644 --- a/libswscale/slice.c +++ b/libswscale/slice.c @@ -288,7 +288,8 @@ int ff_init_filters(SwsContext * c) if (!c->desc) return AVERROR(ENOMEM); c->slice = av_mallocz_array(sizeof(SwsSlice), c->numSlice); - + if (!c->slice) + goto cleanup; res = alloc_slice(&c->slice[0], c->srcFormat, c->srcH, c->chrSrcH, c->chrSrcHSubSample, c->chrSrcVSubSample, 0); if (res < 0) goto cleanup;