Skip to content

fix(filesystem/iso9660): fix bug when compare null bytes #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
t3ls wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(filesystem/iso9660): fix bug when compare null bytes #93

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a583bbe
fix(filesystem/iso9660): fix bug when compare null bytes
t3ls Feb 4, 2021
024e69f
chore(filesystem/iso9660): move nullBytesAlt to a new var
t3ls Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions filesystem/iso9660/volume_descriptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,16 +231,17 @@ func parsePrimaryVolumeDescriptor(b []byte) (*primaryVolumeDescriptor, error) {
}
// expiration can be never
nullBytes := []byte{48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0}
nullBytesAlt := bytes.Repeat([]byte{0}, len(nullBytes))
var expiration, effective time.Time
expirationBytes := b[847 : 847+17]
effectiveBytes := b[864 : 864+17]
if bytes.Compare(expirationBytes, nullBytes) != 0 {
if bytes.Compare(expirationBytes, nullBytes) != 0 && bytes.Compare(expirationBytes, nullBytesAlt) != 0 {
expiration, err = decBytesToTime(expirationBytes)
if err != nil {
return nil, fmt.Errorf("Unable to convert expiration date/time from bytes: %v", err)
}
}
if bytes.Compare(effectiveBytes, nullBytes) != 0 {
if bytes.Compare(effectiveBytes, nullBytes) != 0 && bytes.Compare(expirationBytes, nullBytesAlt) != 0 {
effective, err = decBytesToTime(effectiveBytes)
if err != nil {
return nil, fmt.Errorf("Unable to convert effective date/time from bytes: %v", err)
Expand Down Expand Up @@ -332,16 +333,17 @@ func parseSupplementaryVolumeDescriptor(b []byte) (*supplementaryVolumeDescripto
}
// expiration can be never
nullBytes := []byte{48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 0}
nullBytesAlt := bytes.Repeat([]byte{0}, len(nullBytes))
var expiration, effective time.Time
expirationBytes := b[847 : 847+17]
effectiveBytes := b[864 : 864+17]
if bytes.Compare(expirationBytes, nullBytes) != 0 {
if bytes.Compare(expirationBytes, nullBytes) != 0 && bytes.Compare(expirationBytes, nullBytesAlt) != 0 {
expiration, err = decBytesToTime(expirationBytes)
if err != nil {
return nil, fmt.Errorf("Unable to convert expiration date/time from bytes: %v", err)
}
}
if bytes.Compare(effectiveBytes, nullBytes) != 0 {
if bytes.Compare(effectiveBytes, nullBytes) != 0 && bytes.Compare(expirationBytes, nullBytesAlt) != 0 {
effective, err = decBytesToTime(effectiveBytes)
if err != nil {
return nil, fmt.Errorf("Unable to convert effective date/time from bytes: %v", err)
Expand Down