From patchwork Mon Jul 13 17:09:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Kim X-Patchwork-Id: 20993 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 63BA244BAD2 for ; Mon, 13 Jul 2020 20:10:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4632668A494; Mon, 13 Jul 2020 20:10:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25E8F68A345 for ; Mon, 13 Jul 2020 20:10:01 +0300 (EEST) Received: by mail-pl1-f202.google.com with SMTP id f2so7619722plt.2 for ; Mon, 13 Jul 2020 10:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=FXjRTZaUo86ggwwhs+uYxJI4OUZP0c8TGK+wd81c7nk=; b=pPJsmEE45wKk2wPJ2lqiHLANElapJ4c8rQR9zoCxzi/GjSNH1T7wKZXM1Yh4Qvgeca CCLt/792COyMSFvioqMUseGP6WixuQ7Bj5+SEVzbiqix0E1BITECCUnjCUnzP3yoYr/g OvsCHZqgSoC+93Ed4IcP7aeibHTj35ns6fsONn6+oP7vrTp+/Zgf5q2U7RM44gTrRmJB wF2SdIDjq9V0CYcq4pfaHUtsJNgLZQlRjE/3V4QEe6tP74AUYt0NrZdi+Qp0pKy4cOCE 530ozi+BXzcHTW9gQh8WPqr41n4fPhTAVHcAEBwr3qo3wIj7sQXogMyOYbvsaJ2pM25v LFVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=FXjRTZaUo86ggwwhs+uYxJI4OUZP0c8TGK+wd81c7nk=; b=GYldLbqbfur3QwnDQPjM+9ipTXbeRrlIuKIU1CBE2fyiCCVIDe+3YfLeOpcXxIkUin KJY6aSEG9eeMWQl3NEy85QgusAvmjPqZ8Yz9yjBsPq2Kx8NeO1LLblW+u/ccdoatg+Tw vss5y++ai9xRTx18h5B9ry/EtyxOUTo826iUISQmF4lAj53primrnZvmaYdV/ouzh1zx zSHUlVIf4ETtJoanw0Fh0BEBvpc9/z9Hgsb/Ty9GgWUJnS/1gbBdr/6nQkQFgBjKuAki VxYVGAOygesuao4ybq+1IBAScCl1OSFKE5W8BmYERTjjFK200g1bC7WsmwO5vRotalt/ CS6A== X-Gm-Message-State: AOAM532xbB/rSQxz7eS5JpLBBhnJyNB5+5F/UHET3MTAsOSNHGPoi0ri uyKHwgnAER2ZeN0RnCSsD+VZUFkp6khriu9Vs0DkikLoY7A56n2WP5Qp68W1kL4aUdR9ESoE8wu akmhA7+krYGtyoLo7bOjTVDSjUIhdrzOxnuNeM8cCaf3/14eROFk6JHUQCljt X-Google-Smtp-Source: ABdhPJxuVAqoEw3/iqo3LYt36wJay/LMnoJ5gt3FIekGcuk5V43hN1I4D5tXOALwjgcuxT4Iv19QEGENDg== X-Received: by 2002:a62:8482:: with SMTP id k124mr732143pfd.285.1594660199134; Mon, 13 Jul 2020 10:09:59 -0700 (PDT) Date: Mon, 13 Jul 2020 10:09:40 -0700 In-Reply-To: <11b6ffd9e674f497508f1b7cbad1dee4284f78c7.1594660141.git.bkkim@google.com> Message-Id: Mime-Version: 1.0 References: <11b6ffd9e674f497508f1b7cbad1dee4284f78c7.1594660141.git.bkkim@google.com> X-Mailer: git-send-email 2.27.0.389.gc38d7665816-goog From: Brian Kim To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3 4/4] libavutil/imgutils: check for non-null buffer in av_image_fill_pointers 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: Brian Kim Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" We were previously always filling data by adding offsets to ptr, which was undefined behavior when ptr was NULL. Signed-off-by: Brian Kim --- libavutil/imgutils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 345b7fa94c..721dc2784a 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -166,6 +166,9 @@ int av_image_fill_pointers(uint8_t *data[4], enum AVPixelFormat pix_fmt, int hei memset(data , 0, sizeof(data[0])*4); + if (!ptr) + return ret; + data[0] = ptr; for (i = 1; i < 4 && sizes[i - 1] > 0; i++) data[i] = data[i - 1] + sizes[i - 1];