Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #106636 from Ivorforce/dictionary-mutating-fix

Browse source 
Fix `Dictionary::operator[]` from C++ accidentally modifying `const` dictionaries.
This commit is contained in:
Thaddeus Crews 2025-10-10 10:26:01 -05:00
commit d4a87d9bb3
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/variant/dictionary.cpp
View file

@ -131,8 +131,10 @@ const Variant &Dictionary::operator[](const Variant &p_key) const {
VariantInternal::initialize(_p->typed_fallback, _p->typed_value.type); VariantInternal::initialize(_p->typed_fallback, _p->typed_value.type);
return *_p->typed_fallback; return *_p->typed_fallback;
} else { } else {
// Will not insert key, so no initialization is necessary. static Variant empty;
return _p->variant_map[key]; const Variant *value = _p->variant_map.getptr(key);
ERR_FAIL_COND_V_MSG(!value, empty, "Bug: Dictionary::operator[] used when there was no value for the given key, please report.");
return *value;
} }
} }

20
scene/resources/audio_stream_wav.cpp
View file

@ -695,7 +695,7 @@ Ref<AudioStreamWAV> AudioStreamWAV::load_from_buffer(const Vector<uint8_t> &p_st
// Let users override potential loop points from the WAV. // Let users override potential loop points from the WAV.
// We parse the WAV loop points only with "Detect From WAV" (0). // We parse the WAV loop points only with "Detect From WAV" (0).
int import_loop_mode = p_options["edit/loop_mode"]; int import_loop_mode = p_options.get("edit/loop_mode", 0);
uint16_t format_bits = 0; uint16_t format_bits = 0;
uint16_t format_channels = 0; uint16_t format_channels = 0;
@ -933,8 +933,8 @@ Ref<AudioStreamWAV> AudioStreamWAV::load_from_buffer(const Vector<uint8_t> &p_st
//apply frequency limit //apply frequency limit
bool limit_rate = p_options["force/max_rate"]; bool limit_rate = p_options.get("force/max_rate", false);
uint32_t limit_rate_hz = p_options["force/max_rate_hz"]; uint32_t limit_rate_hz = p_options.get("force/max_rate_hz", 0);
if (limit_rate && rate > limit_rate_hz && rate > 0 && frames > 0) { if (limit_rate && rate > limit_rate_hz && rate > 0 && frames > 0) {
// resample! // resample!
int64_t new_data_frames = (int64_t)(frames * (float)limit_rate_hz / (float)rate); int64_t new_data_frames = (int64_t)(frames * (float)limit_rate_hz / (float)rate);
@ -975,7 +975,7 @@ Ref<AudioStreamWAV> AudioStreamWAV::load_from_buffer(const Vector<uint8_t> &p_st
frames = new_data_frames; frames = new_data_frames;
} }
bool normalize = p_options["edit/normalize"]; bool normalize = p_options.get("edit/normalize", false);
if (normalize) { if (normalize) {
float max = 0.0; float max = 0.0;
@ -994,7 +994,7 @@ Ref<AudioStreamWAV> AudioStreamWAV::load_from_buffer(const Vector<uint8_t> &p_st
} }
} }
bool trim = p_options["edit/trim"]; bool trim = p_options.get("edit/trim", false);
if (trim && (loop_mode == AudioStreamWAV::LOOP_DISABLED) && format_channels > 0) { if (trim && (loop_mode == AudioStreamWAV::LOOP_DISABLED) && format_channels > 0) {
int64_t first = 0; int64_t first = 0;
@ -1042,8 +1042,8 @@ Ref<AudioStreamWAV> AudioStreamWAV::load_from_buffer(const Vector<uint8_t> &p_st
if (import_loop_mode >= 2) { if (import_loop_mode >= 2) {
loop_mode = (AudioStreamWAV::LoopMode)(import_loop_mode - 1); loop_mode = (AudioStreamWAV::LoopMode)(import_loop_mode - 1);
loop_begin = p_options["edit/loop_begin"]; loop_begin = p_options.get("edit/loop_begin", 0);
loop_end = p_options["edit/loop_end"]; loop_end = p_options.get("edit/loop_end", 0);
// Wrap around to max frames, so `-1` can be used to select the end, etc. // Wrap around to max frames, so `-1` can be used to select the end, etc.
if (loop_begin < 0) { if (loop_begin < 0) {
loop_begin = CLAMP(loop_begin + frames, 0, frames - 1); loop_begin = CLAMP(loop_begin + frames, 0, frames - 1);
@ -1053,8 +1053,8 @@ Ref<AudioStreamWAV> AudioStreamWAV::load_from_buffer(const Vector<uint8_t> &p_st
} }
} }
int compression = p_options["compress/mode"]; int compression = p_options.get("compress/mode", 0);
bool force_mono = p_options["force/mono"]; bool force_mono = p_options.get("force/mono", false);
if (force_mono && format_channels == 2) { if (force_mono && format_channels == 2) {
Vector<float> new_data; Vector<float> new_data;
@ -1067,7 +1067,7 @@ Ref<AudioStreamWAV> AudioStreamWAV::load_from_buffer(const Vector<uint8_t> &p_st
format_channels = 1; format_channels = 1;
} }
bool force_8_bit = p_options["force/8_bit"]; bool force_8_bit = p_options.get("force/8_bit", false);
if (force_8_bit) { if (force_8_bit) {
is16 = false; is16 = false;
} }