maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #26962 from ibrahn/small-x11setcontext-fix

Browse source 
fix for access after free in OS_X11::set_context.
This commit is contained in:
Rémi Verschelde 2019-03-12 16:28:43 +01:00 committed by GitHub
parent fa416b3404 7822cc9329
commit 53131635b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
platform/x11/os_x11.cpp
View file

@ -3048,11 +3048,12 @@ void OS_X11::set_context(int p_context) {
if (p_context == CONTEXT_ENGINE) {
classHint->res_name = (char *)"Godot_Engine";
char *config_name_tmp = (char *)((String)GLOBAL_GET("application/config/name")).utf8().ptrw();
if (config_name_tmp)
config_name = strdup(config_name_tmp);
else
String config_name_tmp = GLOBAL_GET("application/config/name");
if (config_name_tmp.length() > 0) {
config_name = strdup(config_name_tmp.utf8().get_data());
} else {
config_name = strdup("Godot Engine");
}
wm_class = config_name;
}