Fixes for issues Coverity has reported (VPP-972)

[vpp.git] / src / uri / uri_socket_test.c

diff --git a/src/uri/uri_socket_test.c b/src/uri/uri_socket_test.c
index 5f7084d..4469b03 100644 (file)
--- a/src/uri/uri_socket_test.c
+++ b/src/uri/uri_socket_test.c
@@ -36,8 +36,6 @@ main (int argc, char *argv[])
 
   if (argc >= 3)
     {
-      bytes = ((long) atoi (argv[4])) << 20;
-      no_echo = atoi (argv[3]);
       portno = atoi (argv[2]);
       server = gethostbyname (argv[1]);
       if (server == NULL)
@@ -45,6 +43,28 @@ main (int argc, char *argv[])
          clib_unix_warning ("gethostbyname");
          exit (1);
        }
+
+      argc -= 3;
+      argv += 3;
+
+      if (argc)
+       {
+         bytes = ((long) atoi (argv[0])) << 20;
+         argc--;
+         argv++;
+       }
+      if (argc)
+       {
+         no_echo = atoi (argv[0]);
+         argc--;
+         argv++;
+       }
+      if (argc)
+       {
+         test_bytes = atoi (argv[0]);
+         argc--;
+         argv++;
+       }
     }
   else
     {