* editfns.c (Fcurrent_time_zone): Don't overrun buffer

even if the time zone offset is outlandishly large.
Don't mishandle offset == INT_MIN.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4336d6a6b83edcfa9c3a469f6fd391fb8fa9e078..afd78a46c6e674e6ce573f09822fe2dd9a385f9e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -26,6 +26,10 @@
        * dispnew.c (add_window_display_history): Don't overrun buffer.
        Truncate instead; this is OK since it's just a log.
 
+       * editfns.c (Fcurrent_time_zone): Don't overrun buffer
+       even if the time zone offset is outlandishly large.
+       Don't mishandle offset == INT_MIN.
+
 2011-08-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        Integer and memory overflow issues (Bug#9196).

diff --git a/src/editfns.c b/src/editfns.c
index 6759016766f98a2476d5e046027e58d6b2bc76f9..580298c6e7db98bb009f9adec7c7f00903ce3301 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2014,7 +2014,7 @@ the data it can't find.  */)
     {
       int offset = tm_diff (t, &gmt);
       char *s = 0;
-      char buf[6];
+      char buf[sizeof "+00" + INT_STRLEN_BOUND (int)];
 
 #ifdef HAVE_TM_ZONE
       if (t->tm_zone)
@@ -2029,7 +2029,8 @@ the data it can't find.  */)
       if (!s)
        {
          /* No local time zone name is available; use "+-NNNN" instead.  */
-         int am = (offset < 0 ? -offset : offset) / 60;
+         int m = offset / 60;
+         int am = offset < 0 ? - m : m;
          sprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60, am%60);
          s = buf;
        }