Changeset 98104 in vbox

Timestamp:

Jan 17, 2023 2:47:49 PM (23 months ago)

Author:

vboxsync

Message:

IPRT/RTTimeZoneGetCurrent-posix.cpp: Skip quoting before uinsg ZONE variable from /etc/sysconfig/clock.

File:

• trunk/src/VBox/Runtime/r3/posix/RTTimeZoneGetCurrent-posix.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/posix/RTTimeZoneGetCurrent-posix.cpp

@@ -80 +80 @@
  *                              <tzfile.h>:TZDIR (normally /usr/share/zoneinfo),
  *                              e.g. Europe/London, or Etc/UTC, or UTC, or etc.
+ *
+ * @note    File format is documented in RFC-8536.
  */
 static int rtIsValidTimeZoneFile(const char *pszTimeZone)
@@ -218 +220 @@
      * Older versions of RedHat / OEL don't have /etc/localtime as a symlink or
      * /etc/timezone but instead have /etc/sysconfig/clock which contains a line
-     * of the syntax ZONE=Europe/London amongst other entries.
+     * of the syntax ZONE=Europe/London or ZONE="Europe/London" amongst other entries.
      */
     pszPath = PATH_SYSCONFIG_CLOCK;
@@ -230 +232 @@
             {
                 static char const s_szVarEq[] = "ZONE=";
-                if (memcmp(szBuf, RT_STR_TUPLE(s_szVarEq)) == 0)
+                char             *pszStart    = RTStrStrip(szBuf);
+                if (memcmp(pszStart, RT_STR_TUPLE(s_szVarEq)) == 0)
                 {
-                    const char *pszTimeZone = &szBuf[sizeof(s_szVarEq) - 1];
+                    char *pszTimeZone = &pszStart[sizeof(s_szVarEq) - 1];
+
+                    /* Drop any quoting before using the value, assuming it is plain stuff: */
+                    if (*pszTimeZone == '\"' || *pszTimeZone == '\'')
+                    {
+                        pszTimeZone++;
+                        size_t const cchTimeZone = strlen(pszTimeZone);
+                        if (cchTimeZone && (pszTimeZone[cchTimeZone - 1] == '"' || pszTimeZone[cchTimeZone - 1] == '\''))
+                            pszTimeZone[cchTimeZone - 1] = '\0';
+                    }
+
                     rc = rtIsValidTimeZoneFile(pszTimeZone);
                     if (RT_SUCCESS(rc))