Check identifier page CodeSet

Matthew Wong · Matthew Wong · commit e9c0cbe139b1 · 2021-06-03T14:12:43.000-07:00
diff --git a/internal/os/disk/api.go b/internal/os/disk/api.go
@@ -220,7 +220,7 @@ func (DiskAPI) GetDiskPage83ID(disk syscall.Handle) (string, error) {
 	page83ID := []byte{}
 	byteSize := unsafe.Sizeof(byte(0))
 	for n = 0; n < devIDDesc.NumberOfIdentifiers; n++ {
-		if pID.Association == StorageIDAssocDevice {
+		if pID.Association == StorageIDAssocDevice && (pID.CodeSet == StorageIDCodeSetBinary || pID.CodeSet == StorageIDCodeSetASCII) {
 			for m = 0; m < pID.IdentifierSize; m++ {
 				page83ID = append(page83ID, *(*byte)(unsafe.Pointer(uintptr(unsafe.Pointer(&pID.Identifier[0])) + byteSize*uintptr(m))))
 			}

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ func (DiskAPI) GetDiskPage83ID(disk syscall.Handle) (string, error) {`
`220`	`220`	`page83ID := []byte{}`
`221`	`221`	`byteSize := unsafe.Sizeof(byte(0))`
`222`	`222`	`for n = 0; n < devIDDesc.NumberOfIdentifiers; n++ {`
`223`		`- if pID.Association == StorageIDAssocDevice {`
	`223`	`+ if pID.Association == StorageIDAssocDevice && (pID.CodeSet == StorageIDCodeSetBinary \|\| pID.CodeSet == StorageIDCodeSetASCII) {`
`224`	`224`	`for m = 0; m < pID.IdentifierSize; m++ {`
`225`	`225`	`page83ID = append(page83ID, (byte)(unsafe.Pointer(uintptr(unsafe.Pointer(&pID.Identifier[0])) + byteSize*uintptr(m))))`
`226`	`226`	`}`