[Emacs-diffs] master f5fc5cd 1/2: Merge from gnulib

[Paul Eggert]

branch: master
commit f5fc5cd5c207a4fc3bdde381ad4f74c8fe6bb5d6
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from gnulib
    
    This incorporates:
    2015-07-29 time_rz: port to pedantic memcpy
    * lib/time_rz.c: Copy from gnulib.
---
 lib/time_rz.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lib/time_rz.c b/lib/time_rz.c
index cbbe2c6..f94893a 100644
--- a/lib/time_rz.c
+++ b/lib/time_rz.c
@@ -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;
 }