Changeset 40012 for trunk

Timestamp:

Apr 13, 2017, 5:37:44 AM (9 years ago)

Author:

eugene

Message:

handle invalid characters in column numbers

File:

• trunk/Ohana/src/opihi/cmd.data/read_vectors.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.data/read_vectors.c

@@ -115 +115 @@
   }
   fseeko (f, 0LL, SEEK_SET);
+
+  buffer = NULL;
 
   Nvec = (argc - 1) / 2;
@@ -160 +162 @@
 
     colstr = argv[2*i+2];
+
+    // numerical columns, e.g., 15, must be base 10 and not have other characters (15x)
+    if (isdigit(colstr[0])) {
+      char *endptr;
+      long colnum_tmp = strtol(colstr, &endptr, 10);
+      if (endptr[0]) {
+        gprint (GP_ERR, "unexpected characters in column number: %s\n", endptr);
+        goto bad_colname;
+      }
+      col[i] = colnum_tmp;
+      continue;
+    }
+
+    // allow 'excel' columns names of the form A-Z, AA-AZ, BA-BZ, .. ZA-ZZ
     for (j = 0; j < strlen (colstr); j++) {
-      if (isdigit(colstr[j])) {
-        col[i] = atof (colstr);
-        continue;
-      }
-      // allow 'excel' columns names of the form A-Z, AA-AZ, BA-BZ, .. ZA-ZZ
       if (strlen(colstr) >= 3) goto bad_colname;
       if (colstr[0] < 'A') goto bad_colname;