Changeset 2322

Timestamp:

Jan 18, 2019, 4:18:49 PM (6 years ago)

Author:

Yuri Dario

Message:

Fix parsing of whitespace only lines in cron2.dat.

File:

• cron2/trunk/src/cron2.c (modified) (3 diffs)

cron2/trunk/src/cron2.c ¶

@@ -835 +835 @@
     PROCESS *theProc;
 
-    if((theProc = (PROCESS *)malloc(sizeof(PROCESS))) == NULL)
+    if((theProc = (PROCESS *)calloc(1,sizeof(PROCESS))) == NULL)
     {
         log("Memory allocation failure in parse_line()\n");
@@ -847 +847 @@
 
     x = 0;
-    token = strtok(line," ");
+    token = strtok(line," \t");
+
+    // check for empty line
+    if (token == NULL) {
+        printf("ERROR: invalid characters in line %d of CRON2.DAT\n",ln);
+        log("ERROR: invalid characters in line %d of CRON2.DAT\n",ln);
+        c2errno = BAD_CRON2_ENTRY;
+        free(theProc->origline);
+        free(theProc);
+        return(NULL);
+    }
 
     while(token)
@@ -1635 +1645 @@
         }
 
-        token = strtok(NULL," ");
+        token = strtok(NULL," \t");
     }