@@ -92,6 +92,7 @@ Alejandro Dubrovsky <s328940*student.uq.edu.au>

 Magnus Ekdahl <magnus*debian.org>

 Jens Elkner <elkner*linofee.org>

 Jason Englander <jason*englanders.cc>

+Andy Fiddaman <clam*fiddaman.net>

 Tony Finch <dot*dotat.at>

 David Ford <david+cert*blue-labs.org>

 Piotr Gackiewicz <gacek*intertele.pl>

@@ -1,3 +1,9 @@

+Wed Oct 20 22:16:58 CEST 2004 (tk)

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

+  * libclamav, clamd: fix possible stack corruption under Solaris (only when

+		      compiled with --enable-readdir_r). Thanks to Andy

+		      Fiddaman <clam*fiddaman.net>.

+

 Wed Oct 20 21:00:37 CEST 2004 (tk)

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

   * clamdscan: fix error messages (problem reported by Jason Haar

@@ -11,13 +17,13 @@ Wed Oct 20 11:37:40 BST 2004 (njh)

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

   * libclamav/mbox.c:	PARTIAL MODE ONLY: fixed possible stack corruption

 				under Solaris, patch from Andy Fiddaman

-				<clam@fiddaman.net>

+				<clam*fiddaman.net>

 Tue Oct 19 14:56:27 BST 2004 (njh)

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

   * libclamav/message.c:	Some base64 encoders encode extra NUL bytes

 			at the end - ensure that they aren't added when

-			decoding, reported by James Lick <jlick@drivel.com>

+			decoding, reported by James Lick <jlick*drivel.com>

 Tue Oct 19 02:53:46 CEST 2004 (tk)

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

@@ -36,6 +36,12 @@

 #include <clamav.h>

 #include <pthread.h>

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

+#ifdef C_SOLARIS

+#include <limits.h>

+#endif

+#endif

+

 #include "cfgparser.h"

 #include "others.h"

 #include "scanner.h"

@@ -74,8 +80,12 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

 	DIR *dd;

 	struct dirent *dent;

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

+#ifdef C_SOLARIS

+	char result[sizeof(struct dirent) + MAX_PATH + 1];

+#else

 	struct dirent result;

 #endif

+#endif

 	struct stat statbuf;

 	struct cfgstruct *cpt;

 	char *fname;

@@ -97,9 +107,9 @@ int dirscan(const char *dirname, const char **virname, unsigned long int *scanne

     if((dd = opendir(dirname)) != NULL) {

 #ifdef HAVE_READDIR_R_3

-	while(!readdir_r(dd, &result, &dent) && dent) {

+	while(!readdir_r(dd, (struct dirent *) &result, &dent) && dent) {

 #elif defined(HAVE_READDIR_R_2)

-	while((dent = (struct dirent *) readdir_r(dd, &result))) {

+	while((dent = (struct dirent *) readdir_r(dd, (struct dirent *) &result))) {

 #else

 	while((dent = readdir(dd))) {

 #endif

@@ -44,6 +44,12 @@

 pthread_mutex_t cli_gentemp_mutex = PTHREAD_MUTEX_INITIALIZER;

 #endif

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

+#ifdef C_SOLARIS

+#include <limits.h>

+#endif

+#endif

+

 #include "clamav.h"

 #include "others.h"

 #include "md5.h"

@@ -374,8 +380,12 @@ int cli_rmdirs(const char *dirname)

 	DIR *dd;

 	struct dirent *dent;

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

+#ifdef C_SOLARIS

+	char result[sizeof(struct dirent) + MAX_PATH + 1];

+#else

 	struct dirent result;

 #endif

+#endif

 	struct stat maind, statbuf;

 	char *fname;

@@ -386,9 +396,9 @@ int cli_rmdirs(const char *dirname)

 	    if(!rmdir(dirname)) break;

 #ifdef HAVE_READDIR_R_3

-	    while(!readdir_r(dd, &result, &dent) && dent) {

+	    while(!readdir_r(dd, (struct dirent *) &result, &dent) && dent) {

 #elif defined(HAVE_READDIR_R_2)

-	    while((dent = (struct dirent *) readdir_r(dd, &result))) {

+	    while((dent = (struct dirent *) readdir_r(dd, (struct dirent *) &result))) {

 #else

 	    while((dent = readdir(dd))) {

 #endif

@@ -39,6 +39,12 @@

 #include "str.h"

 #include "defaults.h"

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

+#ifdef C_SOLARIS

+#include <limits.h>

+#endif

+#endif

+

 /* TODO: clean up the code */

 static int cli_ac_addsig(struct cl_node *root, const char *virname, const char *hexsig, int sigid, int parts, int partno, unsigned short type, unsigned int mindist, unsigned int maxdist, char *offset, unsigned short target)

@@ -730,8 +736,12 @@ int cl_loaddbdir(const char *dirname, struct cl_node **root, unsigned int *signo

 	DIR *dd;

 	struct dirent *dent;

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

+#ifdef C_SOLARIS

+	char result[sizeof(struct dirent) + MAX_PATH + 1];

+#else

 	struct dirent result;

 #endif

+#endif

 	char *dbfile;

 	int ret;

@@ -744,9 +754,9 @@ int cl_loaddbdir(const char *dirname, struct cl_node **root, unsigned int *signo

     cli_dbgmsg("Loading databases from %s\n", dirname);

 #ifdef HAVE_READDIR_R_3

-    while(!readdir_r(dd, &result, &dent) && dent) {

+    while(!readdir_r(dd, (struct dirent *) &result, &dent) && dent) {

 #elif defined(HAVE_READDIR_R_2)

-    while((dent = (struct dirent *) readdir_r(dd, &result))) {

+    while((dent = (struct dirent *) readdir_r(dd, (struct dirent *) &result))) {

 #else

     while((dent = readdir(dd))) {

 #endif

@@ -793,10 +803,14 @@ const char *cl_retdbdir(void)

 int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

 {

 	DIR *dd;

-	struct dirent *dent;

+	const struct dirent *dent;

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

+#ifdef C_SOLARIS

+	char result[sizeof(struct dirent) + MAX_PATH + 1];

+#else

 	struct dirent result;

 #endif

+#endif

         char *fname;

@@ -817,9 +831,9 @@ int cl_statinidir(const char *dirname, struct cl_stat *dbstat)

     cli_dbgmsg("Stat()ing files in %s\n", dirname);

 #ifdef HAVE_READDIR_R_3

-    while(!readdir_r(dd, &result, &dent) && dent) {

+    while(!readdir_r(dd, (struct dirent *) &result, &dent) && dent) {

 #elif defined(HAVE_READDIR_R_2)

-    while((dent = (struct dirent *) readdir_r(dd, &result))) {

+    while((dent = (struct dirent *) readdir_r(dd, (struct dirent *) &result))) {

 #else

     while((dent = readdir(dd))) {

 #endif

@@ -854,8 +868,12 @@ int cl_statchkdir(const struct cl_stat *dbstat)

 	DIR *dd;

 	struct dirent *dent;

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

+#ifdef C_SOLARIS

+	char result[sizeof(struct dirent) + MAX_PATH + 1];

+#else

 	struct dirent result;

 #endif

+#endif

 	struct stat sb;

 	int i, found;

 	char *fname;

@@ -874,9 +892,9 @@ int cl_statchkdir(const struct cl_stat *dbstat)

     cli_dbgmsg("Stat()ing files in %s\n", dbstat->dir);

 #ifdef HAVE_READDIR_R_3

-    while(!readdir_r(dd, &result, &dent) && dent) {

+    while(!readdir_r(dd, (struct dirent *) &result, &dent) && dent) {

 #elif defined(HAVE_READDIR_R_2)

-    while((dent = (struct dirent *) readdir_r(dd, &result))) {

+    while((dent = (struct dirent *) readdir_r(dd, (struct dirent *) &result))) {

 #else

     while((dent = readdir(dd))) {

 #endif

@@ -77,6 +77,13 @@ extern int cli_mbox(const char *dir, int desc, unsigned int options); /* FIXME *

 #include <bzlib.h>

 #endif

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

+#ifdef C_SOLARIS

+#include <limits.h>

+#endif

+#endif

+

+

 #define SCAN_ARCHIVE	    (options & CL_SCAN_ARCHIVE)

 #define SCAN_MAIL	    (options & CL_SCAN_MAIL)

 #define SCAN_OLE2	    (options & CL_SCAN_OLE2)

@@ -752,17 +759,21 @@ static int cli_scandir(const char *dirname, const char **virname, long int *scan

 	DIR *dd;

 	struct dirent *dent;

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

+#ifdef C_SOLARIS

+	char result[sizeof(struct dirent) + MAX_PATH + 1];

+#else

 	struct dirent result;

 #endif

+#endif

 	struct stat statbuf;

 	char *fname;

     if((dd = opendir(dirname)) != NULL) {

 #ifdef HAVE_READDIR_R_3

-	while(!readdir_r(dd, &result, &dent) && dent) {

+	while(!readdir_r(dd, (struct dirent *) &result, &dent) && dent) {

 #elif defined(HAVE_READDIR_R_2)

-	while((dent = (struct dirent *) readdir_r(dd, &result))) {

+	while((dent = (struct dirent *) readdir_r(dd, (struct dirent *) &result))) {

 #else

 	while((dent = readdir(dd))) {

 #endif

@@ -812,8 +823,12 @@ static int cli_vba_scandir(const char *dirname, const char **virname, long int *

 	DIR *dd;

 	struct dirent *dent;

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

+#ifdef C_SOLARIS

+	char result[sizeof(struct dirent) + MAX_PATH + 1];

+#else

 	struct dirent result;

 #endif

+#endif

 	struct stat statbuf;

 	char *fname, *fullname;

 	unsigned char *data;

@@ -910,9 +925,9 @@ static int cli_vba_scandir(const char *dirname, const char **virname, long int *

     if((dd = opendir(dirname)) != NULL) {

 #ifdef HAVE_READDIR_R_3

-	while(!readdir_r(dd, &result, &dent) && dent) {

+	while(!readdir_r(dd, (struct dirent *) &result, &dent) && dent) {

 #elif defined(HAVE_READDIR_R_2)

-	while((dent = (struct dirent *) readdir_r(dd, &result))) {

+	while((dent = (struct dirent *) readdir_r(dd, (struct dirent *) &result))) {

 #else

 	while((dent = readdir(dd))) {

 #endif