Changeset 5969 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Dec 5, 2007 6:34:07 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

26546

Message:

Main: Fixed a bug in CFGLDRQueryDateTime() that could trap VBoxSVC if the lastStateChange VM attribute were close to the Epoch (precisely, if lastStateChange + timezone_offset went before midnight, 1970).

File:

• trunk/src/VBox/Main/xml/cfgldr.cpp (modified) (7 diffs)

trunk/src/VBox/Main/xml/cfgldr.cpp

@@ -60 +60 @@
 #include <iprt/alloc.h>
 
-/// @todo (dmik) until RTTimeImplode and friends are done
+/// @todo (dmik) until RTTimeNormalize and friends are done
 #include <time.h>
 
@@ -2799 +2799 @@
     }
 
-    // query as UTF8 string
+    /* query as UTF8 string */
     unsigned size = 0;
     int rc = CFGLDRQueryString(hnode, pszName, NULL, 0, &size);
@@ -2810 +2810 @@
     if (VBOX_SUCCESS(rc)) do
     {
-        // Parse xsd:dateTime. The format is:
-        // '-'? yyyy '-' mm '-' dd 'T' hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
-        // where zzzzzz is: (('+' | '-') hh ':' mm) | 'Z'
+        /* Parse xsd:dateTime. The format is:
+         * '-'? yyyy '-' mm '-' dd 'T' hh ':' mm ':' ss ('.' s+)? (zzzzzz)?
+         * where zzzzzz is: (('+' | '-') hh ':' mm) | 'Z' */
         uint32_t yyyy = 0;
         uint16_t mm = 0, dd = 0, hh = 0, mi = 0, ss = 0;
@@ -2822 +2822 @@
         }
 
-        // currently, we accept only the UTC timezone ('Z'),
-        // ignoring fractional seconds, if present
+        /* currently, we accept only the UTC timezone ('Z'),
+         * ignoring fractional seconds, if present */
         if (pszBuf[0] == 'Z' ||
             (pszBuf[0] == '.' && pszBuf[strlen(pszBuf)-1] == 'Z'))
         {
-            // start with an error
+            /* start with an error */
             rc = VERR_PARSE_ERROR;
 
 #if 0
-            RTTIME time = { yyyy, mm, 0, 0, dd, hh, mm, ss, 0,
+            RTTIME time = { yyyy, (uint8_t) mm, 0, 0, (uint8_t) dd,
+                            (uint8_t) hh, (uint8_t) mm, (uint8_t) ss, 0,
                             RTTIME_FLAGS_TYPE_UTC };
-            if (RTTimeNormalize(&time))
+            if (RTTimeNormalize (&time))
             {
                 RTTIMESPEC timeSpec;
-                if (RTTimeImplode(&time, &timeSpec))
+                if (RTTimeImplode (&timeSpec, &time))
                 {
-                    *pi64Value = RTTimeSpecGetMilli(&timeSpec);
+                    *pi64Value = RTTimeSpecGetMilli (&timeSpec);
                     rc = VINF_SUCCESS;
                 }
             }
 #else
-            /// @todo (dmik) until RTTimeImplode and friends are done
+            /// @todo (dmik) until RTTimeNormalize and friends are done
             int isdst = 0;
             {
@@ -2860 +2861 @@
             time.tm_year = yyyy - 1900;   /* Year less 1900 */
             time_t t = mktime(&time);
-            // mktime expects local time, but we supply it UTC,
-            // do a trick to get the right time value
+            /* mktime expects local time, but we supply it UTC, do a dirty
+             * trick to get the right time value. Note that the trick doesn't
+             * work when UTC + timezone_offset goes before midnight, 1.1.1970
+             * (gmtime() will return NULL on failure) */
             tm *dummytm = gmtime(&t);
-            dummytm->tm_isdst = isdst;
-            time_t delta = t - mktime(dummytm);
-            *pi64Value = t + delta;
-            *pi64Value *= 1000;
-            rc = VINF_SUCCESS;
+            if (dummytm)
+            {
+                dummytm->tm_isdst = isdst;
+                time_t delta = t - mktime(dummytm);
+                *pi64Value = t + delta;
+                *pi64Value *= 1000;
+                rc = VINF_SUCCESS;
+            }
 #endif
         }
@@ -2894 +2900 @@
     RTTimeExplode(&time, &timeSpec);
 #else
-    /// @todo (dmik) until RTTimeImplode and friends are done
+    /// @todo (dmik) until RTTimeNormalize and friends are done
     time_t t = (time_t)(i64Value / 1000);
     tm *ptm = gmtime(&t);
@@ -2914 +2920 @@
                 (uint16_t) time.u8Hour, (uint16_t) time.u8Minute, (uint16_t) time.u8Second);
 #else
-                /// @todo (dmik) until RTTimeImplode and friends are done
+                /// @todo (dmik) until RTTimeNormalize and friends are done
                 time.tm_year, time.tm_mon, time.tm_mday,
                 time.tm_hour, time.tm_min, time.tm_sec);