From 417fa21a8ec4ab20d2e6a201ae440639dd9f4367 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 8 Jan 2024 18:19:12 -0500 Subject: [PATCH] rcxml: avoid crash when checking environment for WLR_DRM_NO_ATOMIC --- src/config/rcxml.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/config/rcxml.c b/src/config/rcxml.c index fd6fd043..33537423 100644 --- a/src/config/rcxml.c +++ b/src/config/rcxml.c @@ -742,9 +742,12 @@ entry(xmlNode *node, char *nodename, char *content) set_adaptive_sync_mode(content, &rc.adaptive_sync); } else if (!strcasecmp(nodename, "allowTearing.core")) { set_bool(content, &rc.allow_tearing); - if (rc.allow_tearing && strcmp(getenv("WLR_DRM_NO_ATOMIC"), "1")) { - rc.allow_tearing = false; - wlr_log(WLR_INFO, "WLR_DRM_NO_ATOMIC is not 1, tearing disabled"); + if (rc.allow_tearing) { + char *no_atomic_env = getenv("WLR_DRM_NO_ATOMIC"); + if (!no_atomic_env || strcmp(no_atomic_env, "1") != 0) { + rc.allow_tearing = false; + wlr_log(WLR_ERROR, "tearing requires WLR_DRM_NO_ATOMIC=1"); + } } } else if (!strcasecmp(nodename, "reuseOutputMode.core")) { set_bool(content, &rc.reuse_output_mode);