Merge pull request #434 from andreas-volz/master

fix a undefined behaviour for std::string and nullptr access
Wargus · Mar 1, 2023 · 4c23bcd · 4c23bcd
2 parents b2680af + 036a839
commit 4c23bcd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/gameheaders/stratagus-game-launcher.h b/gameheaders/stratagus-game-launcher.h
@@ -202,7 +202,11 @@ static void SetUserDataPath(char* data_path) {
 	}
 	strcat(data_path, "\\Stratagus\\");
 #else
-	std::string appimage = std::string(getenv("APPIMAGE"));
+	char *appimage_ptr = getenv("APPIMAGE");
+	std::string appimage;
+	if (appimage_ptr != nullptr) {
+		appimage = std::string(appimage_ptr);
+	}
 	if (!appimage.empty() && fs::exists(fs::path(appimage))) {
 		if (fs::exists(fs::path(appimage + ".data"))) {
 			strcpy(data_path, (appimage + ".data/stratagus").c_str());