gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2084 from bas-vk/rpcnilptr

Browse Source 
console crash on nil ptr
This commit is contained in:
Jeffrey Wilcke
2015-12-18 20:25:55 +01:00
parent fd69d2b7a8 3c9a2c752f
commit 4811409e99
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/geth/js.go
View File

@@ -341,11 +341,12 @@ func (js *jsre) apiBindings(f xeth.Frontend) error {
// Override the unlockAccount and newAccount methods on the personal object since these require user interaction. // Override the unlockAccount and newAccount methods on the personal object since these require user interaction.
// Assign the jeth.unlockAccount and jeth.newAccount in the jsre the original web3 callbacks. These will be called // Assign the jeth.unlockAccount and jeth.newAccount in the jsre the original web3 callbacks. These will be called
// by the jeth.* methods after they got the password from the user and send the original web3 request to the backend. // by the jeth.* methods after they got the password from the user and send the original web3 request to the backend.
persObj := p.Object() if persObj := p.Object(); persObj != nil { // make sure the personal api is enabled over the interface
js.re.Run(`jeth.unlockAccount = personal.unlockAccount;`) js.re.Run(`jeth.unlockAccount = personal.unlockAccount;`)
persObj.Set("unlockAccount", jeth.UnlockAccount) persObj.Set("unlockAccount", jeth.UnlockAccount)
js.re.Run(`jeth.newAccount = personal.newAccount;`) js.re.Run(`jeth.newAccount = personal.newAccount;`)
persObj.Set("newAccount", jeth.NewAccount) persObj.Set("newAccount", jeth.NewAccount)
}
return nil return nil
} }