diff srogue/io.c @ 280:70aa5808c782

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.
author John "Elwin" Edwards
date Fri, 15 Sep 2017 20:51:10 -0400
parents 94a0d9dd5ce1
children e52a8a7ad4c5
line wrap: on
line diff
--- a/srogue/io.c	Fri Sep 15 19:57:54 2017 -0400
+++ b/srogue/io.c	Fri Sep 15 20:51:10 2017 -0400
@@ -268,24 +268,18 @@
 
 #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 */