godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59747 from bruvzg/clang_san_fixes

This commit is contained in:
Rémi Verschelde 2022-03-31 18:47:49 +02:00 committed by GitHub
parent 3aa32ef4b0 947d7c8329
commit 1ed978574e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/object/method_bind.h
View File

@ -214,7 +214,7 @@ public:
private:
PropertyInfo _gen_return_type_info() const {
return reinterpret_cast<const Derived *>(this)->_gen_return_type_info_impl();
return Derived::_gen_return_type_info_impl();
}
};
@ -237,7 +237,7 @@ public:
}
private:
PropertyInfo _gen_return_type_info_impl() const {
static PropertyInfo _gen_return_type_info_impl() {
return {};
}
};
@ -267,7 +267,7 @@ public:
}
private:
PropertyInfo _gen_return_type_info_impl() const {
static PropertyInfo _gen_return_type_info_impl() {
return GetTypeInfo<R>::get_class_info();
}
};

2
modules/gdscript/gdscript.cpp
View File

@ -824,7 +824,7 @@ Error GDScript::reload(bool p_keep_state) {
// Loading a template, don't parse.
#ifdef TOOLS_ENABLED
if (basedir.begins_with(EditorSettings::get_singleton()->get_project_script_templates_dir())) {
if (EditorSettings::get_singleton() && basedir.begins_with(EditorSettings::get_singleton()->get_project_script_templates_dir())) {
return OK;
}
#endif