From d28acb97e3e2de250373f61296ddd770bf29c128 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 20 Jan 1996 20:47:48 +0000 Subject: [PATCH] (Fformat_time_string): Don't crash if the resulting string is empty. Doc fix. --- src/editfns.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/editfns.c b/src/editfns.c index 143bafdc68..bb9c4920ab 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -612,12 +612,12 @@ FORMAT-STRING may contain %-sequences to substitute parts of the time.\n\ %k is replaced by the hour (0-23), blank padded.\n\ %l is replaced by the hour (1-12), blank padded.\n\ %m is replaced by the month (01-12).\n\ -%M is replaced by the minut (00-59).\n\ +%M is replaced by the minute (00-59).\n\ %n is a synonym for \"\\n\".\n\ %p is replaced by AM or PM, as appropriate.\n\ %r is a synonym for \"%I:%M:%S %p\".\n\ %R is a synonym for \"%H:%M\".\n\ -%S is replaced by the seconds (00-60).\n\ +%S is replaced by the second (00-60).\n\ %t is a synonym for \"\\t\".\n\ %T is a synonym for \"%H:%M:%S\".\n\ %U is replaced by the week of the year (01-52), first day of week is Sunday.\n\ @@ -647,8 +647,10 @@ The number of options reflects the `strftime' function.") while (1) { char *buf = (char *) alloca (size); + *buf = 1; if (emacs_strftime (buf, size, XSTRING (format_string)->data, - localtime (&value))) + localtime (&value)) + || !*buf) return build_string (buf); /* If buffer was too small, make it bigger. */ size *= 2; -- 2.20.1