mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-08 08:43:52 -08:00
Code Issues Projects Releases Wiki Activity

(Fformat_time_string): Don't hang if strftime produces

Browse source 
an empty string.  Fix arguments of second call to strftime.
Remove check for result being negative, this cannot happen.
This commit is contained in:
Richard M. Stallman 1997-07-29 02:29:32 +00:00
parent 9a2fe7b204
commit bfbcc5eed0
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/editfns.c
View file

@ -874,16 +874,15 @@ DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 1, 3, 0,
char *buf = (char *) alloca (size + 1);
int result;
buf[0] = '\1';
result = emacs_strftime (buf, size, XSTRING (format_string)->data,
(NILP (universal) ? localtime (&value)
: gmtime (&value)));
if (result > 0 && result < size)
if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0'))
return build_string (buf);
if (result < 0)
error ("Invalid time format specification");
/* If buffer was too small, make it bigger and try again. */
result = emacs_strftime (buf, 0, XSTRING (format_string)->data,
result = emacs_strftime (NULL, 0x7fffffff, XSTRING (format_string)->data,
(NILP (universal) ? localtime (&value)
: gmtime (&value)));
size = result + 1;