diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-31 09:44:47 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-07-31 09:47:18 -0700 |
| commit | f5fc5cd5c207a4fc3bdde381ad4f74c8fe6bb5d6 (patch) | |
| tree | 535aaa08679693391ffd1da39a82e5e053d04e48 /lib | |
| parent | 8d332aeccab2208e6c6bd434738565e6abf12043 (diff) | |
| download | emacs-f5fc5cd5c207a4fc3bdde381ad4f74c8fe6bb5d6.tar.gz | |
Merge from gnulib
This incorporates:
2015-07-29 time_rz: port to pedantic memcpy
* lib/time_rz.c: Copy from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | 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 cbbe2c6ac2f..f94893aa2c1 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; } |