fix order of tests to avoid strstr on NULL value

seaxp · Jul 16, 2021 · abcf85e · abcf85e
1 parent 0a7d178
commit abcf85e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/manager.c b/src/manager.c
@@ -1123,7 +1123,7 @@ main(int argc, char **argv)
     if (workdir == NULL || strlen(workdir) == 0) {
         workdir = pw->pw_dir;
         // If home dir is still not defined or set to nologin/nonexistent, fall back to /tmp
-        if (strstr(workdir, "nologin") || strstr(workdir, "nonexistent") || workdir == NULL || strlen(workdir) == 0) {
+        if (workdir == NULL || strlen(workdir) == 0 || strstr(workdir, "nologin") || strstr(workdir, "nonexistent")) {
             workdir = "/tmp";
         }