mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-03 01:27:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix null ptr in debug_traceTx (#8585)

Browse Source 
Newly introduced `t.logGaps` was being set to `nil` and still accessed
within `clearFailedLogs`. This PR changes the ordering, moving the nil
setting to `CaptureTxEnd`.
This commit is contained in:
Somnath 2023-10-26 09:56:27 +04:00 committed by GitHub
parent e1c71bda2e
commit 043ccef4ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eth/tracers/native/call.go
View File

@ -145,15 +145,11 @@ func (t *callTracer) CaptureStart(env *vm.EVM, from libcommon.Address, to libcom
if create { if create {
t.callstack[0].Type = vm.CREATE t.callstack[0].Type = vm.CREATE
} }
t.logIndex = 0
t.logGaps = make(map[uint64]int)
} }
// CaptureEnd is called after the call finishes to finalize the tracing. // CaptureEnd is called after the call finishes to finalize the tracing.
func (t *callTracer) CaptureEnd(output []byte, gasUsed uint64, err error) { func (t *callTracer) CaptureEnd(output []byte, gasUsed uint64, err error) {
t.callstack[0].processOutput(output, err) t.callstack[0].processOutput(output, err)
t.logIndex = 0
t.logGaps = nil
} }
// CaptureState implements the EVMLogger interface to trace a single step of VM execution. // CaptureState implements the EVMLogger interface to trace a single step of VM execution.
@ -241,8 +237,9 @@ func (t *callTracer) CaptureExit(output []byte, gasUsed uint64, err error) {
} }
func (t *callTracer) CaptureTxStart(gasLimit uint64) { func (t *callTracer) CaptureTxStart(gasLimit uint64) {
t.gasLimit = gasLimit t.gasLimit = gasLimit
t.logIndex = 0
t.logGaps = make(map[uint64]int)
} }
func (t *callTracer) CaptureTxEnd(restGas uint64) { func (t *callTracer) CaptureTxEnd(restGas uint64) {
@ -252,6 +249,8 @@ func (t *callTracer) CaptureTxEnd(restGas uint64) {
clearFailedLogs(&t.callstack[0], false, 0, t.logGaps) clearFailedLogs(&t.callstack[0], false, 0, t.logGaps)
fixLogIndexGap(&t.callstack[0], t.logGaps) fixLogIndexGap(&t.callstack[0], t.logGaps)
} }
t.logIndex = 0
t.logGaps = nil
} }
// GetResult returns the json-encoded nested list of call traces, and any // GetResult returns the json-encoded nested list of call traces, and any
@ -282,7 +281,7 @@ func clearFailedLogs(cf *callFrame, parentFailed bool, gap int, logGaps map[uint
gap += len(cf.Logs) gap += len(cf.Logs)
if gap > 0 { if gap > 0 {
lastIdx := len(cf.Logs) - 1 lastIdx := len(cf.Logs) - 1
if lastIdx > 0 { if lastIdx > 0 && logGaps != nil {
idx := cf.Logs[lastIdx].Index idx := cf.Logs[lastIdx].Index
logGaps[idx] = gap logGaps[idx] = gap
} }