From 8fc8e8e8be787173f41e8256b9068322f8f3d78d Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 20 Nov 2019 09:14:17 +0100 Subject: [PATCH] pipe-loader: check that the pointer to driconf_xml isn't NULL MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This happens when mesa is built with only swrast. The default driver being kmsro and the default driconf file being v3d, it's NULL and then strdup crashes. This fixes a crash with piglit spec/egl_mesa_query_driver/conformance. Signed-off-by: Samuel Pitoiset Reviewed-by: Michel Dänzer Reviewed-by: Kristian H. Kristensen --- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index 2e1bff4..7d90285 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -331,7 +331,7 @@ pipe_loader_drm_get_driinfo_xml(const char *driver_name) const struct drm_driver_descriptor *dd = get_driver_descriptor(driver_name, &lib); - if (dd && dd->driconf_xml) + if (dd && dd->driconf_xml && *dd->driconf_xml) xml = strdup(*dd->driconf_xml); if (lib) -- 2.7.4