From patchwork Mon Dec 21 13:52:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Leconte X-Patchwork-Id: 24608 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 BB4B744B8B9 for ; Mon, 21 Dec 2020 15:57:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E48968A10A; Mon, 21 Dec 2020 15:57:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63426688324 for ; Mon, 21 Dec 2020 15:57:35 +0200 (EET) Received: by mail-pf1-f202.google.com with SMTP id f3so5016845pfa.13 for ; Mon, 21 Dec 2020 05:57:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=HIsM7R7bPBEnEge41ONZDznBEMrM+geQxmXIHvM30dQ=; b=LmSYWE3+iPwLIix14w7X+P14qXBA+y/42yefpn5XdEJF0dwZTWCVHKqG4HVW/JQt3X S3/Eojx5puB4UkVswSX2tsGKmU7gm9IbzHkh4lcPfo6Q5+z2NILPIQWaHn3ajgnJoV6E bZoGGmQDbnOy2JU4DuluY5fsWGg+RzxTA2jC+wt4mfvg2jfrgjqbQCkumDvHwGGiqHGR UKcpZ1JPzXwTD2Gsqs+3x4ejCKOMaMemCH0xhy9ALLWmEAEvVnzvj32pK6ea/1ELsJdq ULeQH9pxxPGH01SSMssuKJJo536M8QjJkm/gr/2x+0B7BVMzpcpfsA/4gAScR3ES1S7T LWDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=HIsM7R7bPBEnEge41ONZDznBEMrM+geQxmXIHvM30dQ=; b=ZEyUZYm2M7iehwwV14nUAN/jmGEdUCYpt0BivZD6gMFcaxNlKL0y5Absx1riJHVWdH dfGtDTGGrnLNstlalBZigiheLv4GkWtP4YoxE+lfXfIj0KG/W2aiPOXRSLb6nAKLH+aB F6YCl+U+ynU2P0QLAdaKfwLOEwoxM6VCD7ycKgK2URlF/x9UjsUqSxmhfpSeRbfuJyti YXhA+U/aNVx1v0TgrfE1HOH0nUISG+9dYtjsKCy4ySRRZKxfGohSl72Op7bXrdO5pAYi AU+BDQpe0PN0FVjL3TFxgopJ1jEdZYeiyI2SNTWkSr1cDza9cGUVGHQbkTtmQg0WSdY7 NRGw== X-Gm-Message-State: AOAM533qVAnZMEO1pTj5tOgqjqqIvefwPp9qQGsbEcF+V7T0WoXj2r9C TlMdc87J18wUZ0KeodnOEPnFq4UjmZbOMF6w3WCACLDIK7G8UjEITrR4UFHHFfS5Ci8FudnYMvc WnSGyR2DbpS2Ym7b9TTtfM1uPNmiipuO619VnH2KigKGD+jpZOLF7XnNv/3CQ4AgikWyx X-Google-Smtp-Source: ABdhPJzvYLHYcPhhXvdPaU0kdoE8hBkZgl3uMDj5qWtAs14nPPsXw1CUYgRE6BTZe54H+hyFMsiix9xezryxEw== X-Received: from jleconte.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:c68]) (user=jleconte job=sendgmr) by 2002:ad4:5b82:: with SMTP id 2mr17267122qvp.28.1608558737529; Mon, 21 Dec 2020 05:52:17 -0800 (PST) Date: Mon, 21 Dec 2020 13:52:08 +0000 Message-Id: <20201221135208.242036-1-jleconte@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog From: jleconte To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] libswscale: avoid UB nullptr-with-offset. 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: jleconte Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libswscale/slice.c | 12 +++++------- libswscale/swscale_unscaled.c | 5 +++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libswscale/slice.c b/libswscale/slice.c index 7849b70f4d..b1cfc0e506 100644 --- a/libswscale/slice.c +++ b/libswscale/slice.c @@ -158,14 +158,12 @@ int ff_init_slice_from_src(SwsSlice * s, uint8_t *src[4], int stride[4], int src chrY + chrH, lumY + lumH}; - uint8_t *const src_[4] = {src[0] + (relative ? 0 : start[0]) * stride[0], - src[1] + (relative ? 0 : start[1]) * stride[1], - src[2] + (relative ? 0 : start[2]) * stride[2], - src[3] + (relative ? 0 : start[3]) * stride[3]}; - s->width = srcW; for (i = 0; i < 4; ++i) { + if (!src[i]) + continue; + uint8_t *const src_ = src[i] + (relative ? 0 : start[i]) * stride[i]; int j; int first = s->plane[i].sliceY; int n = s->plane[i].available_lines; @@ -175,13 +173,13 @@ int ff_init_slice_from_src(SwsSlice * s, uint8_t *src[4], int stride[4], int src if (start[i] >= first && n >= tot_lines) { s->plane[i].sliceH = FFMAX(tot_lines, s->plane[i].sliceH); for (j = 0; j < lines; j+= 1) - s->plane[i].line[start[i] - first + j] = src_[i] + j * stride[i]; + s->plane[i].line[start[i] - first + j] = src_ + j * stride[i]; } else { s->plane[i].sliceY = start[i]; lines = lines > n ? n : lines; s->plane[i].sliceH = lines; for (j = 0; j < lines; j+= 1) - s->plane[i].line[j] = src_[i] + j * stride[i]; + s->plane[i].line[j] = src_ + j * stride[i]; } } diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 563de39696..39fb7cc87f 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1806,6 +1806,9 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[], const AVPixFmtDescriptor *desc_dst = av_pix_fmt_desc_get(c->dstFormat); int plane, i, j; for (plane = 0; plane < 4; plane++) { + if (!dst[plane]) + continue; + int length = (plane == 0 || plane == 3) ? c->srcW : AV_CEIL_RSHIFT(c->srcW, c->chrDstHSubSample); int y = (plane == 0 || plane == 3) ? srcSliceY: AV_CEIL_RSHIFT(srcSliceY, c->chrDstVSubSample); int height = (plane == 0 || plane == 3) ? srcSliceH: AV_CEIL_RSHIFT(srcSliceH, c->chrDstVSubSample); @@ -1813,8 +1816,6 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[], uint8_t *dstPtr = dst[plane] + dstStride[plane] * y; int shiftonly = plane == 1 || plane == 2 || (!c->srcRange && plane == 0); - if (!dst[plane]) - continue; // ignore palette for GRAY8 if (plane == 1 && !dst[2]) continue; if (!src[plane] || (plane == 1 && !src[2])) {