From ab259677179ad9ebc9082a7ec5e60bdfe9c213cb Mon Sep 17 00:00:00 2001
From: "John \"Elwin\" Edwards" <elwin@rlgallery.org>
Date: Fri, 15 Sep 2017 20:51:10 -0400
Subject: [PATCH] Fix potential segfaults at restore related to ctime().

In some games, restore() passes the result of ctime() to mvprintw() or
some other variadic message-formatting function.  If ctime() has not
been declared properly, its return type is inferred to be int instead
of char *.  This does not cause a warning because the compiler does not
know the correct type of variadic arguments.

On platforms where ints and pointers are not the same size, this can,
probably depending on alignment, result in a segfault that is not easy
to trace.

Including time.h fixes the problem.  Some games manually declared
ctime() and avoided the bug.  These declarations have also been
replaced with the include.
---
 arogue5/save.c  |  1 +
 arogue7/save.c  |  3 ++-
 rogue4/extern.h |  2 --
 rogue4/save.c   |  1 +
 srogue/io.c     | 10 ++--------
 srogue/rip.c    |  1 +
 srogue/save.c   |  2 +-
 7 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/arogue5/save.c b/arogue5/save.c
index fbb4108..b1c0ec5 100644
--- a/arogue5/save.c
+++ b/arogue5/save.c
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
+#include <time.h>
 #include "rogue.h"
 
 bool save_file(FILE *savef);
diff --git a/arogue7/save.c b/arogue7/save.c
index 98086fa..a9da8dd 100644
--- a/arogue7/save.c
+++ b/arogue7/save.c
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
+#include <time.h>
 #include "rogue.h"
 #include <fcntl.h>
 #include <errno.h>
@@ -237,7 +238,7 @@ restore(char *file, char *envp[])
 
     mpos = 0;
     msg("");
-    /*msg("%s: %s", file, ctime(&sbuf2.st_mtime));*/
+    msg("%s: %s", file, ctime(&sbuf2.st_mtime));
 
     /*
      * defeat multiple restarting from the same place
diff --git a/rogue4/extern.h b/rogue4/extern.h
index 326976c..20d8f43 100644
--- a/rogue4/extern.h
+++ b/rogue4/extern.h
@@ -54,8 +54,6 @@ extern WINDOW	*hw;
  * Function types
  */
 
-char	*ctime(), *getenv();
-
 void    tstp(), endit(int);
 
 long	lseek();
diff --git a/rogue4/save.c b/rogue4/save.c
index 652f81e..2e4774a 100644
--- a/rogue4/save.c
+++ b/rogue4/save.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <time.h>
 #define KERNEL
 #include <signal.h>
 #undef KERNEL
diff --git a/srogue/io.c b/srogue/io.c
index e858e84..a7ce9d3 100644
--- a/srogue/io.c
+++ b/srogue/io.c
@@ -268,24 +268,18 @@ wait_for(WINDOW *win, char ch)
 
 #ifdef NEED_GETTIME
 #include <stdio.h>
+#include <time.h>
 
 /*
  * gettime:
  *	This routine returns the current time as a string
  */
-#ifdef ATT
-#include <time.h>
-#endif
-#ifdef BSD
-#include <sys/time.h>
-#endif
 
 char *
 gettime()
 {
 	register char *timeptr;
-	char *ctime();
-	long int now, time();
+	long int now;
 
 	time(&now);		/* get current time */
 	timeptr = ctime(&now);	/* convert to string */
diff --git a/srogue/rip.c b/srogue/rip.c
index 461b0e2..adad6d5 100644
--- a/srogue/rip.c
+++ b/srogue/rip.c
@@ -18,6 +18,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <fcntl.h>
+#include <time.h>
 #include "rogue.h"
 #include "rogue.ext"
 
diff --git a/srogue/save.c b/srogue/save.c
index 92e4d67..733b0b1 100644
--- a/srogue/save.c
+++ b/srogue/save.c
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
+#include <time.h>
 #include <errno.h>
 #if !defined(_WIN32)
 #include <unistd.h>
@@ -30,7 +31,6 @@
 #include "rogue.ext"
 
 EXTCHAR version[];
-EXTCHAR *ctime();
 
 bool dosave(void);
 void save_file(FILE *savef);