Merge branch 'master' into feature/regex-type

2 files changed, 6 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 606f54b5..d8d17b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 	add check that time_t is > 0 --- means we're assigning a negative value
 	to an unsigned time_t. Thanks again to Glaudiston Gomes da Silva
 	<glaudistong@gmail.com>.
+	
+	If localtime() or gmtime() return NULL, return a null string.
+	Thanks to Andrew Schorr.
 
 	Unrelated:
 	* builtin.c (call_sub): Fix for indirect gensub, 3 args now works.
diff --git a/builtin.c b/builtin.c
index 12a79177..e8a9614f 100644
--- a/builtin.c
+++ b/builtin.c
@@ -1951,6 +1951,9 @@ do_strftime(int nargs)
 	else
 		tm = localtime(& fclock);
 
+	if (tm == NULL)
+		return make_string("", 0);
+
 	bufp = buf;
 	bufsize = sizeof(buf);
 	for (;;) {