Skip to content

tweak check subfield #4

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

Merged
hectorcorrea merged 3 commits into from
Aug 9, 2021
Merged

tweak check subfield #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f59d157
Update field.go
sunshineplan Jul 20, 2021
823125d
Return error if record start position or length of recBytes was illeg…
sunshineplan Jul 21, 2021
28d3bd7
Somewhere to check data length
sunshineplan Jul 21, 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
8 changes: 5 additions & 3 deletions pkg/marc/field.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,13 @@ func MakeField(tag string, data []byte) (Field, error) {
return f, errors.New("Invalid Indicators detected")
}

if len(data) < 4 { // Each data field contains at least one subfield code.
return f, errors.New("Bad SubFields length")
}

for _, sf := range bytes.Split(data[3:], []byte{st}) {
if len(sf) > 0 {
if len(sf) > 1 {
f.SubFields = append(f.SubFields, SubField{string(sf[0]), string(sf[1:])})
} else {
return f, errors.New("Extraneous field terminator")
}
}
return f, nil
Expand Down
15 changes: 11 additions & 4 deletions pkg/marc/marcfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ func (file *MarcFile) Record() (Record, error) {
rec.Leader = leader

start := leader.dataOffset
if start <= 25 {
return rec, errors.New("Bad data offset")
} else if start > len(recBytes) {
return rec, errors.New("Bad record length")
}
data := recBytes[start:]
dirs := recBytes[24 : start-1]

Expand All @@ -163,11 +168,13 @@ func (file *MarcFile) Record() (Record, error) {
return rec, errors.New("Reported field length incorrect.\n" + details + "\n")
}
fdata := data[begin : begin+length-1] // length includes field terminator
df, err := MakeField(tag, fdata)
if err != nil {
return rec, err
if len(fdata) > 4 { // ignore illegal data
df, err := MakeField(tag, fdata)
if err != nil {
return rec, err
}
rec.Fields = append(rec.Fields, df)
}
rec.Fields = append(rec.Fields, df)
dirs = dirs[12:]
}
return rec, nil
Expand Down