awgtpman: testpoint.c now checks for bad node points

src/gds/awgtpman/testpoint.c

@@ -291,7 +291,15 @@ int tpClear (int node, const testpoint_t tp[], int tplen)
         target = tp;
     }
 
-    for(int i=0; i < testpoints.TP_r_len; ++i)
+    testpoints.TP_r_val = malloc(testpoints.TP_r_len * sizeof(testpoints.TP_r_val[0]));
+    if(testpoints.TP_r_val == NULL)
+    {
+        gdsError(GDS_ERR_MEM, "unable to allocate memory for RPC struct");
+        return -5;
+    }
+
+    int i;
+    for(i=0; i < testpoints.TP_r_len; ++i)
     {
         testpoints.TP_r_val[i] = target[i];
     }
@@ -299,6 +307,7 @@ int tpClear (int node, const testpoint_t tp[], int tplen)
     /* make client handle */
     clnt = tpMakeHandle (node);
     if (clnt == NULL) {
+        free(testpoints.TP_r_val);
         return -3;
     }
 
@@ -306,11 +315,13 @@ int tpClear (int node, const testpoint_t tp[], int tplen)
     if ((cleartp_1 (tpNode[node].id, node, testpoints, &result,
                     clnt) != RPC_SUCCESS) || (result < 0)) {
         gdsError (GDS_ERR_PROG, "unable to clear test points");
+        free(testpoints.TP_r_val);
         result = -4;
     }
 
     /* free handle */
     clnt_destroy (clnt);
+    free(testpoints.TP_r_val);
     return result;
 }
 
@@ -414,7 +425,8 @@ int tpRequest (int node, const testpoint_t tp[], int tplen,
         return -5;
     }
 
-    for(int i=0; i < tplen; ++i)
+    int i;
+    for(i=0; i < tplen; ++i)
     {
         testpoints.TP_r_val[i] = tp[i];
     }
@@ -754,10 +766,12 @@ char* tpCommand (const char* cmd)
         }
         else {
             node = atoi(p);
-            if ((node < 0) || (node >= TP_MAX_NODE) ||
-                 (!tpNode[node].valid)) {
-                printf("node %d valid=%d\n", node, tpNode[node].valid);
-                return cmdreply ("error: invalid node number");
+            if ((node < 0) || (node >= TP_MAX_NODE)) {
+                printf("invalid node number: 0 < node <= %d\n", TP_MAX_NODE);
+                return cmdreply ("error: node number out of range");
+            }
+            if ((!tpNode[node].valid)) {
+                return cmdreply ("error: node number invalid");
             }
             buf = malloc (2000);
             if (!buf) /* JCB */
@@ -790,6 +804,10 @@ char* tpCommand (const char* cmd)
         }
         else {
             p = endptr;
+            if ((node < 0) || (node >= TP_MAX_NODE)) {
+                printf("invalid node number: 0 < node <= %d\n", TP_MAX_NODE);
+                return cmdreply ("error: node number out of range");
+            }
             /* assume test point numbers are specified */
             if (!tpNode[node].valid) {
                 return cmdreply ("error: invalid node number");
@@ -846,6 +864,10 @@ char* tpCommand (const char* cmd)
         }
         else {
             p = endptr;
+            if ((node < 0) || (node >= TP_MAX_NODE)) {
+                printf("invalid node number: 0 < node <= %d\n", TP_MAX_NODE);
+                return cmdreply ("error: node number out of range");
+            }
             /* assume test point numbers are specified */
             if (!tpNode[node].valid) {
                 return cmdreply ("error: invalid node number");