Skip to content

Commit 57fc1d2

Browse files
mueslikaralabe
authored andcommitted
cmd/geth, core/rawdb: add missing error checks (#19871)
* Added missing error checks Add error handling where we assign err a value, but don't check for it being nil. * core/rawdb: tiny style nit
1 parent cc3ef1e commit 57fc1d2

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

cmd/geth/retesteth.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,9 @@ func (api *RetestethAPI) mineBlock() error {
533533
}
534534
}
535535
block, err := api.engine.FinalizeAndAssemble(api.blockchain, header, statedb, txs, []*types.Header{}, receipts)
536+
if err != nil {
537+
return err
538+
}
536539
return api.importBlock(block)
537540
}
538541

core/rawdb/freezer_table.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ func (t *freezerTable) repair() error {
272272
if newLastIndex.filenum != lastIndex.filenum {
273273
// Release earlier opened file
274274
t.releaseFile(lastIndex.filenum)
275-
t.head, err = t.openFile(newLastIndex.filenum, openFreezerFileForAppend)
275+
if t.head, err = t.openFile(newLastIndex.filenum, openFreezerFileForAppend); err != nil {
276+
return err
277+
}
276278
if stat, err = t.head.Stat(); err != nil {
277279
// TODO, anything more we can do here?
278280
// A data file has gone missing...

core/rawdb/freezer_table_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ func TestFreezerBasicsClosing(t *testing.T) {
113113
f.Append(uint64(x), data)
114114
f.Close()
115115
f, err = newCustomTable(os.TempDir(), fname, rm, wm, sc, 50, true)
116+
if err != nil {
117+
t.Fatal(err)
118+
}
116119
}
117120
defer f.Close()
118121

@@ -170,6 +173,9 @@ func TestFreezerRepairDanglingHead(t *testing.T) {
170173
// Now open it again
171174
{
172175
f, err := newCustomTable(os.TempDir(), fname, rm, wm, sc, 50, true)
176+
if err != nil {
177+
t.Fatal(err)
178+
}
173179
// The last item should be missing
174180
if _, err = f.Retrieve(0xff); err == nil {
175181
t.Errorf("Expected error for missing index entry")
@@ -217,6 +223,9 @@ func TestFreezerRepairDanglingHeadLarge(t *testing.T) {
217223
// Now open it again
218224
{
219225
f, err := newCustomTable(os.TempDir(), fname, rm, wm, sc, 50, true)
226+
if err != nil {
227+
t.Fatal(err)
228+
}
220229
// The first item should be there
221230
if _, err = f.Retrieve(0); err != nil {
222231
t.Fatal(err)
@@ -269,6 +278,9 @@ func TestSnappyDetection(t *testing.T) {
269278
// Open without snappy
270279
{
271280
f, err := newCustomTable(os.TempDir(), fname, rm, wm, sc, 50, false)
281+
if err != nil {
282+
t.Fatal(err)
283+
}
272284
if _, err = f.Retrieve(0); err == nil {
273285
f.Close()
274286
t.Fatalf("expected empty table")
@@ -278,6 +290,9 @@ func TestSnappyDetection(t *testing.T) {
278290
// Open with snappy
279291
{
280292
f, err := newCustomTable(os.TempDir(), fname, rm, wm, sc, 50, true)
293+
if err != nil {
294+
t.Fatal(err)
295+
}
281296
// There should be 255 items
282297
if _, err = f.Retrieve(0xfe); err != nil {
283298
f.Close()

0 commit comments

Comments
 (0)