Merge pull request #15 from earlephilhower/onemoretxfix

Reduce code slightly and ensure that only names of the form '<...>' including the terminal '>' are accepted in the parser. Fixes a potential error handling corner case.
earlephilhower · Nov 12, 2020 · 9905fb5 · 9905fb5
2 parents 83b5db7 + 8af39e3
commit 9905fb5
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
@@ -56,14 +56,13 @@ _DEFUN (_tzset_r, (reent_ptr),
   if (tzenv[0] == '<')
     {
       /* This is of the form "<[+-]nn>" so needs a different parsing */
-      if (sscanf (tzenv, "%9[^>]%n", __tzname_std, &n) <= 0)
+      if (sscanf (tzenv, "%9[^>]>%n", __tzname_std, &n) <= 0)
         {
           TZ_UNLOCK;
           return;
         }
-      /* Include the final > and skip it */
+      /* Include the final > */
       strcat (__tzname_std, ">");
-      n++;
     }
   else
     {
@@ -101,17 +100,16 @@ _DEFUN (_tzset_r, (reent_ptr),
   if (tzenv[0] == '<')
     {
       /* This is of the form "<[+-]nn>" so needs a different parsing */
-      if (sscanf (tzenv, "%9[^>]%n", __tzname_dst, &n) <= 0)
+      if (sscanf (tzenv, "%9[^>]>%n", __tzname_dst, &n) <= 0)
         { /* No dst */
           _tzname[1] = _tzname[0];
           _timezone = tz->__tzrule[0].offset;
           _daylight = 0;
           TZ_UNLOCK;
           return;
         }
-      /* Include the final > and skip it */
+      /* Include the final > */
       strcat (__tzname_dst, ">");
-      n++;
       _tzname[1] = __tzname_dst;
     }
   else