Support ISO version 2 reading

aol-nnov · aol-nnov · commit 830ca1af5355 · 2025-04-05T18:53:31.000+03:00
SVDs may have version greater than 1. For now let's check PVD version only. closes #290
diff --git a/filesystem/iso9660/volume_descriptor.go b/filesystem/iso9660/volume_descriptor.go
@@ -184,8 +184,8 @@ func volumeDescriptorFromBytes(b []byte) (volumeDescriptor, error) {
 	}
 	// validate the version
 	version := b[6]
-	if version != isoVersion {
-		return nil, fmt.Errorf("mismatched ISO version in Volume Descriptor. Found %x expected %x", version, isoVersion)
+	if volumeDescriptorType(b[0]) == volumeDescriptorPrimary && version != isoVersion {
+		return nil, fmt.Errorf("mismatched ISO version in Primary Volume Descriptor. Found %x expected %x", version, isoVersion)
 	}
 	// get the type and data - later we will be more intelligent about this and read actual primary volume info
 	vdType := volumeDescriptorType(b[0])

Original file line number	Diff line number	Diff line change
`@@ -184,8 +184,8 @@ func volumeDescriptorFromBytes(b []byte) (volumeDescriptor, error) {`
`184`	`184`	`}`
`185`	`185`	`// validate the version`
`186`	`186`	`version := b[6]`
`187`		`- if version != isoVersion {`
`188`		`- return nil, fmt.Errorf("mismatched ISO version in Volume Descriptor. Found %x expected %x", version, isoVersion)`
	`187`	`+ if volumeDescriptorType(b[0]) == volumeDescriptorPrimary && version != isoVersion {`
	`188`	`+ return nil, fmt.Errorf("mismatched ISO version in Primary Volume Descriptor. Found %x expected %x", version, isoVersion)`
`189`	`189`	`}`
`190`	`190`	`// get the type and data - later we will be more intelligent about this and read actual primary volume info`
`191`	`191`	`vdType := volumeDescriptorType(b[0])`