Merge pull request #113 from HaoyangLiu/irisnet/develop

IRISHUB-524: Add check for iavl proof and value before building multistore proof
irisnet · Oct 11, 2018 · 6a35659 · 6a35659
2 parents c6189e6 + 36cb7e2
commit 6a35659
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/store/rootmultistore.go b/store/rootmultistore.go
@@ -301,6 +301,14 @@ func (rs *rootMultiStore) Query(req abci.RequestQuery) abci.ResponseQuery {
 		return res
 	}
 
+	if len(res.Proof) == 0 {
+		if len(res.Value) == 0 {
+			return res
+		}
+		msg := fmt.Sprintf("proof from store %s is nil", storeName)
+		return sdk.ErrUnknownRequest(msg).QueryResult()
+	}
+
 	commitInfo, errMsg := getCommitInfo(rs.db, res.Height)
 	if errMsg != nil {
 		return sdk.ErrInternal(errMsg.Error()).QueryResult()