diff wave.c @ 2613:1fdf7acc5165

Fix handling of wave files with additional RIFF chunks before the data chunk
author Michael Pavone <pavone@retrodev.com>
date Sun, 16 Feb 2025 11:54:40 -0800
parents efc75ea79164
children
line wrap: on
line diff
--- a/wave.c	Sat Feb 15 23:29:51 2025 -0800
+++ b/wave.c	Sun Feb 16 11:54:40 2025 -0800
@@ -28,7 +28,7 @@
 
 uint8_t wave_read_header(FILE *f, wave_header *header)
 {
-	size_t initial_read = sizeof(*header) - sizeof(header->data_header);
+	size_t initial_read = offsetof(wave_header, data_header);
 	if (fread(header, 1, initial_read, f) != initial_read) {
 		return 0;
 	}
@@ -44,17 +44,21 @@
 	if (memcmp(header->format_header.id, "fmt ", 4)) {
 		return 0;
 	}
-	if (header->format_header.size < sizeof(*header) - sizeof(header->chunk) - sizeof(header->format_header) - sizeof(header->data_header)) {
+	if (header->format_header.size < offsetof(wave_header, data_header) - sizeof(header->chunk) - sizeof(header->format_header)) {
 		return 0;
 	}
 	fseek(f, header->format_header.size + sizeof(header->chunk) + sizeof(header->format_header), SEEK_SET);
-	if (fread(&header->data_header, 1, sizeof(header->data_header), f) != sizeof(header->data_header)) {
-		return 0;
+	for (;;)
+	{
+		if (fread(&header->data_header, 1, sizeof(header->data_header), f) != sizeof(header->data_header)) {
+			return 0;
+		}
+		if (!memcmp(header->data_header.id, "data", 4)) {
+			header->data_offset = ftell(f);
+			return 1;
+		}
+		fseek(f, header->data_header.size, SEEK_CUR);
 	}
-	if (memcmp(header->data_header.id, "data", 4)) {
-		return 0;
-	}
-	return 1;
 }
 
 int wave_finalize(FILE * f)