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

Merge pull request #96240 from DeeJayLSP/mp3-data 

MP3: Use heap for big struct when setting data
This commit is contained in:
Rémi Verschelde 2024-08-30 09:59:39 +02:00
parent 7d9ab705c9 7e49c26729
commit 5418919c3c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/minimp3/audio_stream_mp3.cpp
View File

@ -220,15 +220,19 @@ void AudioStreamMP3::set_data(const Vector<uint8_t> &p_data) {
int src_data_len = p_data.size(); int src_data_len = p_data.size();
const uint8_t *src_datar = p_data.ptr(); const uint8_t *src_datar = p_data.ptr();
mp3dec_ex_t mp3d; mp3dec_ex_t *mp3d = memnew(mp3dec_ex_t);
int err = mp3dec_ex_open_buf(&mp3d, src_datar, src_data_len, MP3D_SEEK_TO_SAMPLE); int err = mp3dec_ex_open_buf(mp3d, src_datar, src_data_len, MP3D_SEEK_TO_SAMPLE);
ERR_FAIL_COND_MSG(err || mp3d.info.hz == 0, "Failed to decode mp3 file. Make sure it is a valid mp3 audio file."); if (err || mp3d->info.hz == 0) {
memdelete(mp3d);
ERR_FAIL_MSG("Failed to decode mp3 file. Make sure it is a valid mp3 audio file.");
}
channels = mp3d.info.channels; channels = mp3d->info.channels;
sample_rate = mp3d.info.hz; sample_rate = mp3d->info.hz;
length = float(mp3d.samples) / (sample_rate * float(channels)); length = float(mp3d->samples) / (sample_rate * float(channels));
mp3dec_ex_close(&mp3d); mp3dec_ex_close(mp3d);
memdelete(mp3d);
clear_data(); clear_data();