good morning!!!!

Skip to content
Snippets Groups Projects
Commit c283d9b5 authored by Hsien-Tang Kao's avatar Hsien-Tang Kao Committed by Péter Szilágyi
Browse files

signer/core: handle JSON unmarshal error (#19123)

parent 4a090a1b
No related branches found
No related tags found
No related merge requests found
...@@ -177,7 +177,9 @@ func NewAbiDBFromFile(path string) (*AbiDb, error) { ...@@ -177,7 +177,9 @@ func NewAbiDBFromFile(path string) (*AbiDb, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
json.Unmarshal(raw, &db.db) if err := json.Unmarshal(raw, &db.db); err != nil {
return nil, err
}
return db, nil return db, nil
} }
...@@ -192,14 +194,18 @@ func NewAbiDBFromFiles(standard, custom string) (*AbiDb, error) { ...@@ -192,14 +194,18 @@ func NewAbiDBFromFiles(standard, custom string) (*AbiDb, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
json.Unmarshal(raw, &db.db) if err := json.Unmarshal(raw, &db.db); err != nil {
return nil, err
}
// Custom file may not exist. Will be created during save, if needed // Custom file may not exist. Will be created during save, if needed
if _, err := os.Stat(custom); err == nil { if _, err := os.Stat(custom); err == nil {
raw, err = ioutil.ReadFile(custom) raw, err = ioutil.ReadFile(custom)
if err != nil { if err != nil {
return nil, err return nil, err
} }
json.Unmarshal(raw, &db.customdb) if err := json.Unmarshal(raw, &db.customdb); err != nil {
return nil, err
}
} }
return db, nil return db, nil
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment