@@ -1,3 +1,11 @@

+Sun Feb  3 21:04:54 EET 2008 (edwin)

+---------------------------------

+  * libclamav/others.[ch]: introduce cli_ctime() that uses ctime_r() when

+		available, and falls back to locking with a mutex around

+		ctime(). (ensures we are using the same mutex always).

+  * clamd, shared: use cli_ctime() instead of the thread-unsafe ctime().

+		This fixes stability problems.

+

 Sun Feb  3 19:13:43 CET 2008 (tk)

 ---------------------------------

   * libclamav/filetypes.h: set MAGIC_BUFFER_SIZE to 512

@@ -216,6 +216,7 @@ int main(int argc, char **argv)

 	cl_debug();

     if((cpt = cfgopt(copt, "LogFile"))->enabled) {

+	char timestr[32];

 	logg_file = cpt->strarg;

 	if(strlen(logg_file) < 2 || (logg_file[0] != '/' && logg_file[0] != '\\' && logg_file[1] != ':')) {

 	    fprintf(stderr, "ERROR: LogFile requires full path.\n");

@@ -224,7 +225,7 @@ int main(int argc, char **argv)

 	    return 1;

 	}

 	time(&currtime);

-	if(logg("#+++ Started at %s", ctime(&currtime))) {

+	if(logg("#+++ Started at %s", cli_ctime(&currtime, timestr, sizeof(timestr)))) {

 	    fprintf(stderr, "ERROR: Problem with internal logger. Please check the permissions on the %s file.\n", logg_file);

 	    logg_close();

 	    freecfg(copt);

@@ -50,6 +50,7 @@

 #include "clamuko.h"

 #include "others.h"

 #include "shared.h"

+#include "libclamav/others.h"

 #ifndef	C_WINDOWS

 #define	closesocket(s)	close(s)

@@ -260,6 +261,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

 	int max_threads, i, ret = 0;

 	unsigned int options = 0;

 	threadpool_t *thr_pool;

+	char timestr[32];

 #ifndef	C_WINDOWS

 	struct sigaction sigact;

 #endif

@@ -664,7 +666,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_engine *engine, unsigne

     }

     time(&current_time);

-    logg("--- Stopped at %s", ctime(&current_time));

+    logg("--- Stopped at %s", cli_ctime(&current_time, timestr, sizeof(timestr)));

     return ret;

 }

@@ -43,6 +43,7 @@

 #include "libclamav/clamav.h"

 #include "libclamav/str.h"

+#include "libclamav/others.h"

 #include "shared/cfgparser.h"

 #include "shared/output.h"

@@ -53,8 +54,6 @@

 #include "server.h"

 #include "session.h"

-static pthread_mutex_t ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

-

 int command(int desc, const struct cl_engine *engine, const struct cl_limits *limits, unsigned int options, const struct cfgstruct *copt, int timeout)

 {

 	char buff[1025];

@@ -117,11 +116,10 @@ int command(int desc, const struct cl_engine *engine, const struct cl_limits *li

 	    sprintf(path, "%s/daily.cld", dbdir);

 	if(!access(path, R_OK) && (daily = cl_cvdhead(path))) {

+		char timestr[32];

 		time_t t = (time_t) daily->stime;

-	    pthread_mutex_lock(&ctime_mutex);

-	    mdprintf(desc, "ClamAV "VERSION"/%d/%s", daily->version, ctime(&t));

-	    pthread_mutex_unlock(&ctime_mutex);

+	    mdprintf(desc, "ClamAV "VERSION"/%d/%s", daily->version, cli_ctime(&t, timestr, sizeof(timestr)));

 	    cl_cvdfree(daily);

 	} else {

 	    mdprintf(desc, "ClamAV "VERSION"\n");

@@ -62,6 +62,7 @@ CLAMAV_PRIVATE {

     cli_memstr;

     cli_strdup;

     cli_realloc;

+    cli_ctime;

     tableCreate;

     tableDestroy;

     tableRemove;

@@ -59,6 +59,11 @@

 #ifdef CL_THREAD_SAFE

 #  include <pthread.h>

 static pthread_mutex_t cli_gentemp_mutex = PTHREAD_MUTEX_INITIALIZER;

+

+# ifndef HAVE_CTIME_R

+static pthread_mutex_t cli_ctime_mutex = PTHREAD_MUTEX_INITIALIZER;

+# endif

+

 #endif

 #if defined(HAVE_READDIR_R_3) || defined(HAVE_READDIR_R_2)

@@ -853,3 +858,32 @@ int cli_bitset_test(bitset_t *bs, unsigned long bit_offset)

 	}

 	return (bs->bitset[char_offset] & ((unsigned char)1 << bit_offset));

 }

+

+const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize)

+{

+	if(bufsize < 26) {

+		/* standard says we must have at least 26 bytes buffer */

+		cli_warnmsg("buffer too small for ctime\n");

+		return NULL;

+	}

+#ifdef HAVE_CTIME_R	

+# ifdef HAVE_CTIME_R_2

+	char* y = ctime_r(timep, buf);

+	return y;

+# else

+	return ctime_r(timep, buf, bufsize);

+# endif

+#else /* no ctime_r */

+

+# ifdef CL_THREAD_SAFE

+	pthread_mutex_lock(&cli_ctime_mutex);

+# endif

+	strncpy(buf, ctime(timep), bufsize-1);

+	buf[bufsize-1] = '\0';

+# ifdef CL_THREAD_SAFE

+	pthread_mutex_unlock(&cli_ctime_mutex);

+# endif

+	return buf;

+#endif

+}

+

@@ -230,5 +230,6 @@ bitset_t *cli_bitset_init(void);

 void cli_bitset_free(bitset_t *bs);

 int cli_bitset_set(bitset_t *bs, unsigned long bit_offset);

 int cli_bitset_test(bitset_t *bs, unsigned long bit_offset);

+const char* cli_ctime(const time_t *timep, char *buf, const size_t bufsize);

 #endif

@@ -334,6 +334,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

 	uint32_t valign, falign, hdr_size, j;

 	struct cli_exe_section *exe_sections;

 	struct cli_matcher *md5_sect;

+	char timestr[32];

     if(!ctx) {

@@ -506,7 +507,7 @@ int cli_scanpe(int desc, cli_ctx *ctx)

     cli_dbgmsg("NumberOfSections: %d\n", nsections);

     timestamp = (time_t) EC32(file_hdr.TimeDateStamp);

-    cli_dbgmsg("TimeDateStamp: %s", ctime(&timestamp));

+    cli_dbgmsg("TimeDateStamp: %s", cli_ctime(&timestamp, timestr, sizeof(timestr)));

     cli_dbgmsg("SizeOfOptionalHeader: %x\n", EC16(file_hdr.SizeOfOptionalHeader));

@@ -50,6 +50,7 @@

 #endif

 #include "output.h"

+#include "libclamav/others.h"

 #ifdef CL_NOTHREADS

 #undef CL_THREAD_SAFE

@@ -132,7 +133,7 @@ int logg(const char *str, ...)

 #ifdef F_WRLCK

 	struct flock fl;

 #endif

-	char *pt, *timestr, vbuff[1025];

+	char vbuff[1025];

 	time_t currtime;

 	struct stat sb;

 	mode_t old_umask;

@@ -189,12 +190,12 @@ int logg(const char *str, ...)

                is not set or we get a bunch of timestamps in the log without

                newlines... */

 	    if(logg_time && ((*vbuff != '*') || logg_verbose)) {

+	        char timestr[32];

 		time(&currtime);

-		pt = ctime(&currtime);

-		timestr = calloc(strlen(pt), 1);

-		strncpy(timestr, pt, strlen(pt) - 1);

+		cli_ctime(&currtime, timestr, sizeof(timestr));

+		/* cut trailing \n */

+		timestr[strlen(timestr)-1] = '\0';

 		fprintf(logg_fd, "%s -> ", timestr);

-		free(timestr);

 	    }

 	    if(*vbuff == '!') {