@@ -1,3 +1,7 @@

+Tue Jan 16 14:09:12 CET 2007 (tk)

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

+  * libclamav/loaddb.c: fix close of wrong fd (bb#233), patch from Edwin

+

 Tue Jan 16 01:22:42 CET 2007 (tk)

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

   * libclamav/entconv.c: fix memory corruption in experimental code (bb#227)

@@ -513,6 +513,7 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_node *root, unsigned in

     time(&start_time);

     for(;;) {				

+	struct stat st_buf;

     	int socketd = socketds[0];

     	if(nsockets > 1) {

     	    int pollret = poll_fds(socketds, nsockets, -1);

@@ -522,6 +523,15 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_node *root, unsigned in

     		socketd = socketds[0]; /* on a poll error use the first socket */

     	    }

     	}    

+	if(fstat(socketd, &st_buf) == -1) {

+	    logg("!fstat(): socket descriptor gone\n");

+	    memmove(socketds, socketds + 1, sizeof(socketds[0]) * nsockets);

+	    nsockets--;

+	    if(!nsockets) {

+		logg("!Main socket gone: fatal\n");

+		break;

+	    }

+	}

 	new_sd = accept(socketd, NULL, NULL);

 	if((new_sd == -1) && (errno != EINTR)) {

 	    if(progexit) {

@@ -529,7 +539,8 @@ int acceptloop_th(int *socketds, int nsockets, struct cl_node *root, unsigned in

 	    }

 	    /* very bad - need to exit or restart */

 #ifdef HAVE_STRERROR_R

-	    logg("!accept() failed: %s\n", strerror_r(errno, buff, BUFFSIZE));

+	    strerror_r(errno, buff, BUFFSIZE);

+	    logg("!accept() failed: %s\n", buff);

 #else

 	    logg("!accept() failed\n");

 #endif

@@ -134,6 +134,7 @@ int cli_unlockdb(const char *dbdirpath)

 	pthread_mutex_unlock(&lock_mutex);

 #ifndef C_WINDOWS

 	close(lock->lock_fd);

+	lock->lock_fd=-1;

 	unlink(lock->lock_file);

 #endif

 	return CL_ELOCKDB;

@@ -141,6 +142,7 @@ int cli_unlockdb(const char *dbdirpath)

     lock->lock_type = -1;

 #ifndef C_WINDOWS

     close(lock->lock_fd);

+    lock->lock_fd=-1;

     unlink(lock->lock_file);

 #endif

     pthread_mutex_unlock(&lock_mutex);

@@ -229,6 +231,7 @@ static int cli_lockdb(const char *dbdirpath, int wait, int writelock)

 #ifndef C_WINDOWS

 	if(errno != EACCES && errno != EAGAIN) {

 	    close(lock->lock_fd);

+	    lock->lock_fd=-1;

 	    unlink(lock->lock_file);

 	    return CL_EIO;

 	}