@@ -1,3 +1,8 @@

+Thu Jul 21 03:47:03 CEST 2005 (tk)

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

+  * libclamav/others.c: cli_rmdirs: fix possible infinite loop. Patch by Mark

+			Pizzolato.

+

 Wed Jul 20 03:41:00 CEST 2005 (tk)

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

   * libclamav/mspack: some cab archives were not properly decompressed (problem

@@ -144,6 +144,11 @@ int rmdirs(const char *dirname)

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

 	while(stat(dirname, &maind) != -1) {

 	    if(!rmdir(dirname)) break;

+	    if(errno != ENOTEMPTY) {

+		logg("^Can't remove temporary directory %s: %s\n", dirname, strerror(errno));

+		closedir(dd);

+		return 0;

+	    }

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

 #ifndef C_INTERIX

@@ -515,6 +515,11 @@ int cli_rmdirs(const char *dirname)

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

 	while(stat(dirname, &maind) != -1) {

 	    if(!rmdir(dirname)) break;

+	    if(errno != ENOTEMPTY) {

+		cli_errmsg("Can't remove temporary directory %s: %s\n", dirname, strerror(errno));

+		closedir(dd);

+		return 0;

+	    }

 #ifdef HAVE_READDIR_R_3

 	    while(!readdir_r(dd, &result.d, &dent) && dent) {