- Add a kludge to detect bad date/times, which cause a seg fault in

[bacula/bacula] / bacula / src / lib / util.c

diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c
index 261292956f7bb1c6243df25b49b71cbe669bfbdd..7ac8df6863ada6348de1b4a074bf2270fc49bf8b 100644 (file)
--- a/bacula/src/lib/util.c
+++ b/bacula/src/lib/util.c
@@ -88,11 +88,21 @@ bash_spaces(char *str)
    }
 }
 
-void bash_spaces(POOL_MEM &pm)
+/* Convert spaces to non-space character. 
+ * This makes scanf of fields containing spaces easier.
+ */
+void
+bash_spaces(POOL_MEM &pm)
 {
-   bash_spaces(pm.c_str());
+   char *str = pm.c_str();
+   while (*str) {
+      if (*str == ' ')
+        *str = 0x1;
+      str++;
+   }
 }
 
+
 /* Convert non-space characters (0x1) back into spaces */
 void
 unbash_spaces(char *str)
@@ -108,16 +118,49 @@ unbash_spaces(char *str)
 void
 unbash_spaces(POOL_MEM &pm)
 {
-   unbash_spaces(pm.c_str());
+   char *str = pm.c_str();
+   while (*str) {
+     if (*str == 0x1)
+        *str = ' ';
+     str++;
+   }
 }
 
-
+#ifdef WIN32
+extern long _timezone;
+extern int _daylight;
+extern long _dstbias;
+extern "C" void __tzset(void);
+extern "C" int _isindst(struct tm *);
+#endif
 
 char *encode_time(time_t time, char *buf)
 {
    struct tm tm;
    int n = 0;
 
+#ifdef WIN32
+    /*
+     * Gross kludge to avoid a seg fault in Microsoft's CRT localtime_r(),
+     * which incorrectly references a NULL returned from gmtime() if
+     * the time (adjusted for the current timezone) is invalid.
+     * This could happen if you have a bad date/time, or perhaps if you
+     * moved a file from one timezone to another?
+     */
+    struct tm *gtm;
+    time_t gtime;
+    __tzset();
+    gtime = time - _timezone;
+    if (!(gtm = gmtime(&gtime))) {
+       return buf;
+    }
+    if (_daylight && _isindst(gtm)) {
+       gtime -= _dstbias;
+       if (!gmtime(&gtime)) {
+         return buf;
+       }
+    }
+#endif
    if (localtime_r(&time, &tm)) {
       n = sprintf(buf, "%04d-%02d-%02d %02d:%02d:%02d",
                   tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,