add some param check

Author: chaozhu

src/main/java/org/tron/common/utils/HttpSelfFormatFieldName.java

@@ -115,6 +115,22 @@ public class HttpSelfFormatFieldName {
     AddressFieldNameMap.put("protocol.ShieldedTransferContract.transparent_from_address", 1);
     AddressFieldNameMap.put("protocol.ShieldedTransferContract.transparent_to_address", 1);
 
+    //FreezeBalanceV2Contract
+    AddressFieldNameMap.put("protocol.FreezeBalanceV2Contract.owner_address", 1);
+    //UnfreezeBalanceV2Contract
+    AddressFieldNameMap.put("protocol.UnfreezeBalanceV2Contract.owner_address", 1);
+    //WithdrawExpireUnfreezeContract
+    AddressFieldNameMap.put("protocol.WithdrawExpireUnfreezeContract.owner_address", 1);
+    //DelegateResourceContract
+    AddressFieldNameMap.put("protocol.DelegateResourceContract.owner_address", 1);
+    AddressFieldNameMap.put("protocol.DelegateResourceContract.receiver_address", 1);
+    //UnDelegateResourceContract
+    AddressFieldNameMap.put("protocol.UnDelegateResourceContract.owner_address", 1);
+    AddressFieldNameMap.put("protocol.UnDelegateResourceContract.receiver_address", 1);
+    AddressFieldNameMap.put("protocol.CanDelegatedMaxSizeRequestMessage.owner_address", 1);
+    AddressFieldNameMap.put("protocol.GetAvailableUnfreezeCountRequestMessage.owner_address", 1);
+    AddressFieldNameMap.put("protocol.CanWithdrawUnfreezeAmountRequestMessage.owner_address", 1);
+
     //***** Tron.proto *****
     //AccountId
     AddressFieldNameMap.put("protocol.AccountId.address", 1);

src/main/java/org/tron/walletcli/Client.java

@@ -1427,24 +1427,19 @@ private void delegateResource(String[] parameters)
         return;
       }
     } else if (parameters.length == 4 || parameters.length == 5) {
-      ownerAddress = getAddressBytes(parameters[index++]);
+      ownerAddress = getAddressBytes(parameters[index]);
       if (ownerAddress != null) {
-        balance = Long.parseLong(parameters[index++]);
-        resourceCode = Integer.parseInt(parameters[index++]);
-        receiverAddress = getAddressBytes(parameters[index++]);
-        if (receiverAddress == null) {
-          System.out.println(
-                  "delegateResource receiverAddress is invalid");
-          return;
-        }
-        if (parameters.length == 5) {
-          lock = Boolean.parseBoolean(parameters[index++]);
-        }
-      } if (ownerAddress == null) {
+        index ++;
+      }
+      balance = Long.parseLong(parameters[index++]);
+      resourceCode = Integer.parseInt(parameters[index++]);
+      receiverAddress = getAddressBytes(parameters[index++]);
+      if (receiverAddress == null) {
         System.out.println(
-                "delegateResource ownerAddress is invalid");
+            "delegateResource receiverAddress is invalid");
         return;
       }
+      lock = Boolean.parseBoolean(parameters[index++]);
     }
 
 
@@ -1719,7 +1714,13 @@ private void getCanWithdrawUnfreezeAmount(String[] parameters) throws CipherExce
     byte[] ownerAddress = getAddressBytes(parameters[index]);
     if (ownerAddress != null) {
       index++;
+      if (parameters.length != 2) {
+        System.out.println("Using getCanWithdrawUnfreezeAmount command needs 2 parameters like: ");
+        System.out.println("getcanwithdrawunfreezeamount [ownerAddress] timestamp");
+        return;
+      }
     }
+
     timestamp = Long.parseLong(parameters[index++]);
     if (timestamp < 0) {
       System.out.println("Invalid param, timestamp >= 0");
@@ -1747,8 +1748,15 @@ private void getCanDelegatedMaxSize(String[] parameters) throws CipherException,
     byte[] ownerAddress = getAddressBytes(parameters[index]);
     if (ownerAddress != null) {
       index++;
+      if (parameters.length < 2) {
+        System.out.println("Using getcandelegatedmaxsize command needs 2 parameters like: ");
+        System.out.println("getcandelegatedmaxsize [ownerAddress] type");
+        return ;
+      }
     }
+
     type = Integer.parseInt(parameters[index++]);
+
     if (ResourceCode.BANDWIDTH.ordinal() != type && ResourceCode.ENERGY.ordinal() != type) {
       System.out.println("getcandelegatedmaxsize param type must be: 0 or 1");
       return;
@@ -1773,6 +1781,9 @@ private void getAvailableUnfreezeCount(String[] parameters) throws CipherExcepti
     byte[] ownerAddress = null;
     if (parameters.length == 1) {
         ownerAddress = getAddressBytes(parameters[index]);
+        if (ownerAddress == null) {
+          return ;
+        }
     }
 
     Optional<GetAvailableUnfreezeCountResponseMessage> result = walletApiWrapper.getAvailableUnfreezeCount(ownerAddress);