Check if env is not null, since now non-fcitx standard path is nullable.

fcitx · Apr 21, 2024 · 6824c95 · 6824c95
1 parent aafc5b5
commit 6824c95
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lib/fcitx-utils/standardpath.cpp b/src/lib/fcitx-utils/standardpath.cpp
@@ -197,7 +197,7 @@ class StandardPathPrivate {
                 }
                 dir = stringutils::joinPath(home, defaultPath);
             } else {
-                if (strcmp(env, "XDG_RUNTIME_DIR") == 0) {
+                if (env && strcmp(env, "XDG_RUNTIME_DIR") == 0) {
                     dir = stringutils::joinPath(
                         defaultPath,
                         stringutils::concat("fcitx-runtime-", geteuid()));
@@ -212,7 +212,7 @@ class StandardPathPrivate {
             }
         }
 
-        if (!dir.empty() && strcmp(env, "XDG_RUNTIME_DIR") == 0) {
+        if (!dir.empty() && env && strcmp(env, "XDG_RUNTIME_DIR") == 0) {
             struct stat buf;
             if (stat(dir.c_str(), &buf) != 0 || buf.st_uid != geteuid() ||
                 (buf.st_mode & 0777) != S_IRWXU) {