Merge pull request #167 from AssetMantle/0xankit/issuesFixes

`baseReq` sanitization before `MakeMsg`
AssetMantle · Dec 9, 2022 · b1b0ad7 · b1b0ad7
2 parents 6442066 + 5cf07d9
commit b1b0ad7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/schema/helpers/base/transaction.go b/schema/helpers/base/transaction.go
@@ -105,19 +105,19 @@ func (transaction transaction) RESTRequestHandler(cliContext context.CLIContext)
 
 		baseReq := transactionRequest.GetBaseReq()
 
+		baseReq = baseReq.Sanitize()
+		if !baseReq.ValidateBasic(responseWriter) {
+			rest.WriteErrorResponse(responseWriter, http.StatusBadRequest, "")
+			return
+		}
+
 		var msg sdkTypes.Msg
 		msg, err = transactionRequest.MakeMsg()
 		if err != nil {
 			rest.WriteErrorResponse(responseWriter, http.StatusBadRequest, err.Error())
 			return
 		}
 
-		baseReq = baseReq.Sanitize()
-		if !baseReq.ValidateBasic(responseWriter) {
-			rest.WriteErrorResponse(responseWriter, http.StatusBadRequest, "")
-			return
-		}
-
 		if err = msg.ValidateBasic(); err != nil {
 			rest.WriteErrorResponse(responseWriter, http.StatusBadRequest, err.Error())
 			return

diff --git a/schema/lists/base/dataList.go b/schema/lists/base/dataList.go
@@ -19,7 +19,9 @@ func (dataList dataList) GetList() []data.Data {
 	DataList := make([]data.Data, dataList.List.Size())
 
 	for i, listable := range dataList.List.Get() {
-		DataList[i] = listable.(data.Data)
+		if listable != nil {
+			DataList[i] = listable.(data.Data)
+		}
 	}
 
 	return DataList

diff --git a/schema/lists/base/dataList_test.go b/schema/lists/base/dataList_test.go
@@ -73,7 +73,8 @@ func Test_dataList_GetList(t *testing.T) {
 		fields fields
 		want   []data.Data
 	}{
-		{"+ve with empty struct", fields{list{}}, []data.Data{}}, // TODO: issue Panic for nil
+		{"+ve with empty struct", fields{list{}}, []data.Data{}},
+		{"+ve with empty struct", fields{list{nil}}, []data.Data{nil}},
 		{"+ve", fields{NewList(dataToListables([]data.Data{NewStringData("Data")}...)...)}, []data.Data{NewStringData("Data")}},
 	}
 	for _, tt := range tests {