Merge pull request #100422 from hpvb/from-the-depth-of-despair

akien-mga · akien-mga · commit 7b90590e85c3 · 2024-12-18T00:39:53.000+01:00
Fix a crash trying to save an empty AudioStream
diff --git a/scene/resources/audio_stream_wav.cpp b/scene/resources/audio_stream_wav.cpp
@@ -587,7 +587,7 @@ void AudioStreamWAV::set_data(const Vector<uint8_t> &p_data) {
 Vector<uint8_t> AudioStreamWAV::get_data() const {
 	Vector<uint8_t> pv;
 
-	if (!data.is_empty()) {
+	if (data_bytes) {
 		pv.resize(data_bytes);
 		memcpy(pv.ptrw(), data.ptr() + DATA_PAD, data_bytes);
 	}

Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ void AudioStreamWAV::set_data(const Vector<uint8_t> &p_data) {`
`587`	`587`	`Vector<uint8_t> AudioStreamWAV::get_data() const {`
`588`	`588`	`Vector<uint8_t> pv;`
`589`	`589`
`590`		`- if (!data.is_empty()) {`
	`590`	`+ if (data_bytes) {`
`591`	`591`	`pv.resize(data_bytes);`
`592`	`592`	`memcpy(pv.ptrw(), data.ptr() + DATA_PAD, data_bytes);`
`593`	`593`	`}`