Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
96fd50be
Commit
96fd50be
authored
Oct 01, 2018
by
Martin Holst Swende
Committed by
Guillaume Ballet
Oct 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
accounts/abi: fix panic in MethodById lookup. Fixes #17797 (#17798)
parent
dc5d643b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
abi.go
accounts/abi/abi.go
+3
-0
abi_test.go
accounts/abi/abi_test.go
+10
-1
No files found.
accounts/abi/abi.go
View file @
96fd50be
...
...
@@ -137,6 +137,9 @@ func (abi *ABI) UnmarshalJSON(data []byte) error {
// MethodById looks up a method by the 4-byte id
// returns nil if none found
func
(
abi
*
ABI
)
MethodById
(
sigdata
[]
byte
)
(
*
Method
,
error
)
{
if
len
(
sigdata
)
<
4
{
return
nil
,
fmt
.
Errorf
(
"data too short (% bytes) for abi method lookup"
,
len
(
sigdata
))
}
for
_
,
method
:=
range
abi
.
Methods
{
if
bytes
.
Equal
(
method
.
Id
(),
sigdata
[
:
4
])
{
return
&
method
,
nil
...
...
accounts/abi/abi_test.go
View file @
96fd50be
...
...
@@ -711,5 +711,14 @@ func TestABI_MethodById(t *testing.T) {
t
.
Errorf
(
"Method %v (id %v) not 'findable' by id in ABI"
,
name
,
common
.
ToHex
(
m
.
Id
()))
}
}
// Also test empty
if
_
,
err
:=
abi
.
MethodById
([]
byte
{
0x00
});
err
==
nil
{
t
.
Errorf
(
"Expected error, too short to decode data"
)
}
if
_
,
err
:=
abi
.
MethodById
([]
byte
{});
err
==
nil
{
t
.
Errorf
(
"Expected error, too short to decode data"
)
}
if
_
,
err
:=
abi
.
MethodById
(
nil
);
err
==
nil
{
t
.
Errorf
(
"Expected error, nil is short to decode data"
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment