diff options
| author | Maarten Heremans <maarten.heremans@dynactionize.com> | 2018-10-22 16:45:02 +0200 |
|---|---|---|
| committer | Maarten Heremans <maarten.heremans@dynactionize.com> | 2018-10-22 16:45:02 +0200 |
| commit | cf09952b6bfd93901a38fe3bc398973fbeb9d4f9 (patch) | |
| tree | 783e812b6bcf9a18d56df88125cd4f0cf1bc1638 /modules/gdnative | |
| parent | 955a913a1fcc7551a3e03017eb2ac8edc4ee7043 (diff) | |
Fixes crash when loading *.escn resources with gdnative #20141
The issue is that ResourceFormatLoaderText is a singleton. It was created in a faulty way in
ResourceFormatLoaderNativeScript::load
It was created on the stack, which caused the static singleton pointer to be overwritten. This
causes then segmentation faults if the singleton is used later on.
IMO singleton creation needs to made safer to avoid other similar issues in the future.
Diffstat (limited to 'modules/gdnative')
| -rw-r--r-- | modules/gdnative/nativescript/nativescript.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index 37e72bf9f8..3e56275396 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -1711,8 +1711,7 @@ void NativeReloadNode::_notification(int p_what) { } RES ResourceFormatLoaderNativeScript::load(const String &p_path, const String &p_original_path, Error *r_error) { - ResourceFormatLoaderText rsflt; - return rsflt.load(p_path, p_original_path, r_error); + return ResourceFormatLoaderText::singleton->load(p_path, p_original_path, r_error); } void ResourceFormatLoaderNativeScript::get_recognized_extensions(List<String> *p_extensions) const { |