Fix nil pointer panic in debug_traceBlockByNumber RPC endpoint (#1842)

0xPolygon · Aug 21, 2023 · 2684cc5 · 2684cc5
1 parent 25e09c2
commit 2684cc5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/jsonrpc/debug_endpoint.go b/jsonrpc/debug_endpoint.go
@@ -197,12 +197,12 @@ func (d *Debug) TraceCall(
 			}
 
 			tracer, cancel, err := newTracer(config)
-			defer cancel()
-
 			if err != nil {
 				return nil, err
 			}
 
+			defer cancel()
+
 			return d.store.TraceCall(tx, header, tracer)
 		},
 	)
@@ -217,12 +217,12 @@ func (d *Debug) traceBlock(
 	}
 
 	tracer, cancel, err := newTracer(config)
-	defer cancel()
-
 	if err != nil {
 		return nil, err
 	}
 
+	defer cancel()
+
 	return d.store.TraceBlock(block, tracer)
 }