mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-15 19:31:03 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity

go/store/nbs: journal.go: Fix some nil dereference panics is rarely executed error handling code regarding a journal manifest in readOnly mode.

Browse Source
This commit is contained in:
Aaron Son
2023-11-28 17:03:10 -08:00
parent 3c9d6342d3
commit 59f3de6a4f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
go/store/nbs/journal.go
View File

@@ -528,7 +528,9 @@ func newJournalManifest(ctx context.Context, dir string) (m *journalManifest, er
var f *os.File
f, err = openIfExists(filepath.Join(dir, manifestFileName))
if err != nil {
_ = lock.Unlock()
if lock != nil {
_ = lock.Unlock()
}
return nil, err
} else if f == nil {
return m, nil
@@ -538,17 +540,23 @@ func newJournalManifest(ctx context.Context, dir string) (m *journalManifest, er
err = cerr // keep first error
}
if err != nil {
_ = lock.Unlock()
if lock != nil {
_ = lock.Unlock()
}
}
}()
var ok bool
ok, _, err = m.ParseIfExists(ctx, &Stats{}, nil)
if err != nil {
_ = lock.Unlock()
if lock != nil {
_ = lock.Unlock()
}
return nil, err
} else if !ok {
_ = lock.Unlock()
if lock != nil {
_ = lock.Unlock()
}
return nil, ErrUnreadableManifest
}
return