godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #72703 from lyuma/stringname_constructor_mistake 

StringName: fix returning dangling data from char constructor.
This commit is contained in:
Rémi Verschelde 2023-02-06 17:47:27 +01:00
parent d201df1ffa 82c52eab6c
commit 112f8faf5c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
core/string/string_name.cpp
View File

@ -226,19 +226,16 @@ StringName::StringName(const char *p_name, bool p_static) {
_data = _data->next; _data = _data->next;
} }
if (_data) { if (_data && _data->refcount.ref()) {
if (_data->refcount.ref()) { // exists
// exists if (p_static) {
if (p_static) { _data->static_count.increment();
_data->static_count.increment();
}
#ifdef DEBUG_ENABLED
if (unlikely(debug_stringname)) {
_data->debug_references++;
}
#endif
} }
#ifdef DEBUG_ENABLED
if (unlikely(debug_stringname)) {
_data->debug_references++;
}
#endif
return; return;
} }
@ -288,19 +285,17 @@ StringName::StringName(const StaticCString &p_static_string, bool p_static) {
_data = _data->next; _data = _data->next;
} }
if (_data) { if (_data && _data->refcount.ref()) {
if (_data->refcount.ref()) { // exists
// exists if (p_static) {
if (p_static) { _data->static_count.increment();
_data->static_count.increment();
}
#ifdef DEBUG_ENABLED
if (unlikely(debug_stringname)) {
_data->debug_references++;
}
#endif
return;
} }
#ifdef DEBUG_ENABLED
if (unlikely(debug_stringname)) {
_data->debug_references++;
}
#endif
return;
} }
_data = memnew(_Data); _data = memnew(_Data);
@ -348,19 +343,17 @@ StringName::StringName(const String &p_name, bool p_static) {
_data = _data->next; _data = _data->next;
} }
if (_data) { if (_data && _data->refcount.ref()) {
if (_data->refcount.ref()) { // exists
// exists if (p_static) {
if (p_static) { _data->static_count.increment();
_data->static_count.increment();
}
#ifdef DEBUG_ENABLED
if (unlikely(debug_stringname)) {
_data->debug_references++;
}
#endif
return;
} }
#ifdef DEBUG_ENABLED
if (unlikely(debug_stringname)) {
_data->debug_references++;
}
#endif
return;
} }
_data = memnew(_Data); _data = memnew(_Data);