Skip to content

Added alternative RockRidgeIdentifier 'IEEE_P1282', fixed a memory bug #54

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
nohajc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added alternative RockRidgeIdentifier 'IEEE_P1282', fixed a memory bug #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion iso9660.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,9 @@ func (de *DirectoryEntry) UnmarshalBinary(data []byte) error {

// add padding if identifier length was even]
idPaddingLen := (identifierLen + 1) % 2
de.SystemUse = data[33+identifierLen+idPaddingLen : length]
systemUseData := data[33+identifierLen+idPaddingLen : length]
de.SystemUse = make([]byte, len(systemUseData))
copy(de.SystemUse, systemUseData)

return nil
}
Expand Down
10 changes: 5 additions & 5 deletions rockridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"io/fs"
"os"
"slices"
)

/* The following types of Rock Ridge records are being handled in some way:
Expand All @@ -18,10 +19,9 @@ import (
* - [ ] SF (RR 4.1.7: file data in sparse file format)
*/

const (
RockRidgeIdentifier = "RRIP_1991A"
RockRidgeVersion = 1
)
var RockRidgeIdentifiers = []string{"IEEE_P1282", "RRIP_1991A"}

const RockRidgeVersion = 1

type RockRidgeNameEntry struct {
Flags byte
Expand All @@ -35,7 +35,7 @@ func suspHasRockRidge(se SystemUseEntrySlice) (bool, error) {
}

for _, entry := range extensions {
if entry.Identifier == RockRidgeIdentifier && entry.Version == RockRidgeVersion {
if slices.Contains(RockRidgeIdentifiers, entry.Identifier) && entry.Version == RockRidgeVersion {
return true, nil
}
}
Expand Down