Kaynağa Gözat

[3.x] ResourceImporterWAV: Detect if data chunk size is larger than the actual size

(cherry picked from commit 57159bcb8c352c33d972e8a8de6a2f4dd9748b38)
DeeJayLSP 1 ay önce
ebeveyn
işleme
d240313513
1 değiştirilmiş dosya ile 14 ekleme ve 1 silme
  1. 14 1
      editor/import/resource_importer_wav.cpp

+ 14 - 1
editor/import/resource_importer_wav.cpp

@@ -111,7 +111,15 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
 	}
 
 	/* GET FILESIZE */
-	file->get_32(); // filesize
+
+	// The file size in header is 8 bytes less than the actual size.
+	// See https://docs.fileformat.com/audio/wav/
+	const int FILE_SIZE_HEADER_OFFSET = 8;
+	uint32_t file_size_header = file->get_32() + FILE_SIZE_HEADER_OFFSET;
+	uint64_t file_size = file->get_len();
+	if (file_size != file_size_header) {
+		WARN_PRINT(vformat("File size %d is %s than the expected size %d.", file_size, file_size > file_size_header ? "larger" : "smaller", file_size_header));
+	}
 
 	/* CHECK WAVE */
 
@@ -208,7 +216,12 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
 				break;
 			}
 
+			uint64_t remaining_bytes = file_size - file_pos;
 			frames = chunksize;
+			if (remaining_bytes < chunksize) {
+				WARN_PRINT("Data chunk size is smaller than expected. Proceeding with actual data size.");
+				frames = remaining_bytes;
+			}
 
 			if (format_channels == 0) {
 				file->close();