Changeset 41468 for trunk

Timestamp:

Jan 12, 2021, 4:15:16 PM (6 years ago)

Author:

eugene

Message:

cleanly handle invalid dates; free error lines

Location:

trunk/Ohana/src/libohana

Files:

• include/ohana.h (modified) (1 diff)
• src/errors.c (modified) (1 diff)
• src/time.c (modified) (1 diff)

trunk/Ohana/src/libohana/include/ohana.h

@@ -415 +415 @@
 int    push_error                PROTO((char *line));
 int    print_error               PROTO((void));
+void   free_error                PROTO(());
 
 // gprint gets a stub implementation in libohana. opihi implements the real one.

trunk/Ohana/src/libohana/src/errors.c

@@ -51 +51 @@
   return (TRUE);
 }
+
+void free_error() {
+  for (int i = 0; i < Nline; i++) {
+    FREE (errorlines[i]);
+  }
+  FREE (errorlines);
+}

trunk/Ohana/src/libohana/src/time.c

@@ -251 +251 @@
   ALLOCATE (line, char, 64);
   gmt   = gmtime (&second);
-  snprintf (line, 64, "%04d/%02d/%02d,%02d:%02d:%02d", 1900 + gmt[0].tm_year, gmt[0].tm_mon+1, gmt[0].tm_mday, gmt[0].tm_hour, gmt[0].tm_min, gmt[0].tm_sec); 
+  if (!gmt) {
+    snprintf (line, 64, "INVALID DATE");
+  } else {
+    snprintf (line, 64, "%04d/%02d/%02d,%02d:%02d:%02d", 1900 + gmt[0].tm_year, gmt[0].tm_mon+1, gmt[0].tm_mday, gmt[0].tm_hour, gmt[0].tm_min, gmt[0].tm_sec); 
+  }
   return (line);