]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from gnulib
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 31 Jul 2015 16:44:47 +0000 (09:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 31 Jul 2015 16:47:18 +0000 (09:47 -0700)
This incorporates:
2015-07-29 time_rz: port to pedantic memcpy
* lib/time_rz.c: Copy from gnulib.

lib/time_rz.c

index cbbe2c6ac2faa123d5486e74228bd713e7e02dda..f94893aa2c18afe9a2954384ed24433880aac6f3 100644 (file)
@@ -105,7 +105,9 @@ tzalloc (char const *name)
       tz->tzname_copy[0] = tz->tzname_copy[1] = NULL;
 #endif
       tz->tz_is_set = !!name;
-      extend_abbrs (tz->abbrs, name, name_size);
+      tz->abbrs[0] = '\0';
+      if (name)
+        extend_abbrs (tz->abbrs, name, name_size);
     }
   return tz;
 }