From 712332ed54f14b5ee34c2990e351ca48992488b2 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Thu, 8 Feb 2018 17:33:09 +0000
Subject: [PATCH] i965: prevent potentially null pointer access
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
CID: 1418110
---
 src/mesa/drivers/dri/i965/intel_screen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 1f866cf8459..3f74ee78f37 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -315,7 +315,7 @@ modifier_is_supported(const struct gen_device_info *devinfo,
    int i;
 
    /* ISL had better know about the modifier */
-   if (!modinfo)
+   if (!fmt || !modinfo)
       return false;
 
    if (modinfo->aux_usage == ISL_AUX_USAGE_CCS_E) {
-- 
2.30.2