From 470c003d1e87b352687f6c58be77b09feebcb72c Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 11 May 2020 11:59:21 +0200
Subject: [PATCH] console: fix some crashes/errors in the bridge (#21050)
Fixes #21046
---
console/bridge.go | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/console/bridge.go b/console/bridge.go
index efebd914ea..e26017e6d3 100644
--- a/console/bridge.go
+++ b/console/bridge.go
@@ -232,6 +232,9 @@ func (b *bridge) readPinAndReopenWallet(call jsre.Call) (goja.Value, error) {
// original RPC method (saved in jeth.unlockAccount) with it to actually execute
// the RPC call.
func (b *bridge) UnlockAccount(call jsre.Call) (goja.Value, error) {
+ if nArgs := len(call.Arguments); nArgs < 2 {
+ return nil, fmt.Errorf("usage: unlockAccount(account, [ password, duration ])")
+ }
// Make sure we have an account specified to unlock.
if call.Argument(0).ExportType().Kind() != reflect.String {
return nil, fmt.Errorf("first argument must be the account to unlock")
@@ -275,6 +278,9 @@ func (b *bridge) UnlockAccount(call jsre.Call) (goja.Value, error) {
// prompt to acquire the passphrase and executes the original RPC method (saved in
// jeth.sign) with it to actually execute the RPC call.
func (b *bridge) Sign(call jsre.Call) (goja.Value, error) {
+ if nArgs := len(call.Arguments); nArgs < 2 {
+ return nil, fmt.Errorf("usage: sign(message, account, [ password ])")
+ }
var (
message = call.Argument(0)
account = call.Argument(1)
@@ -310,6 +316,9 @@ func (b *bridge) Sign(call jsre.Call) (goja.Value, error) {
// Sleep will block the console for the specified number of seconds.
func (b *bridge) Sleep(call jsre.Call) (goja.Value, error) {
+ if nArgs := len(call.Arguments); nArgs < 1 {
+ return nil, fmt.Errorf("usage: sleep(<number of seconds>)")
+ }
if !isNumber(call.Argument(0)) {
return nil, fmt.Errorf("usage: sleep(<number of seconds>)")
}
@@ -337,7 +346,7 @@ func (b *bridge) SleepBlocks(call jsre.Call) (goja.Value, error) {
blocks = call.Argument(0).ToInteger()
}
if nArgs >= 2 {
- if isNumber(call.Argument(1)) {
+ if !isNumber(call.Argument(1)) {
return nil, fmt.Errorf("expected number as second argument")
}
sleep = call.Argument(1).ToInteger()
--
GitLab