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

+Tue Apr  8 19:04:50 CEST 2008 (acab)

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

+  * libclamav: hardfail on unlink failure

+

 Mon Apr  7 22:38:27 CEST 2008 (tk)

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

   * libclamav/msexpand.c: fix big-endian support

@@ -375,11 +375,13 @@ static int ea05(int desc, cli_ctx *ctx, char *tmpd) {

     lseek(i, 0, SEEK_SET);

     if(cli_magic_scandesc(i, ctx) == CL_VIRUS) {

       close(i);

-      if(!cli_leavetemps_flag) cli_unlink(tempfile);

+      if(!cli_leavetemps_flag)

+        if(cli_unlink(tempfile)) return CL_EIO;

       return CL_VIRUS;

     }

     close(i);

-    if(!cli_leavetemps_flag) cli_unlink(tempfile);

+    if(!cli_leavetemps_flag) 

+      if (cli_unlink(tempfile)) return CL_EIO;

   }

   return ret;

 }

@@ -883,11 +885,13 @@ static int ea06(int desc, cli_ctx *ctx, char *tmpd) {

     lseek(i, 0, SEEK_SET);

     if(cli_magic_scandesc(i, ctx) == CL_VIRUS) {

       close(i);

-      if(!cli_leavetemps_flag) cli_unlink(tempfile);

+      if(!cli_leavetemps_flag) 

+        if (cli_unlink(tempfile)) return CL_EIO;

       return CL_VIRUS;

     }

     close(i);

-    if(!cli_leavetemps_flag) cli_unlink(tempfile);

+    if(!cli_leavetemps_flag)

+      if (cli_unlink(tempfile)) return CL_EIO;

   }

   return ret;

 }

@@ -766,7 +766,7 @@ static int chm_decompress_stream(int fd, chm_metadata_t *metadata, const char *d

 	lzx_free(stream);

 	/* Delete the file */

-	cli_unlink(filename);

+	if(cli_unlink(filename)) retval = -1;

 	retval = tmpfd;

 abort:

@@ -1242,7 +1242,7 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 		/* empty message */

 		fclose(fd);

 #ifdef	SAVE_TMP

-		cli_unlink(tmpfilename);

+		if (cli_unlink(tmpfilename)) return CL_EIO;

 #endif

 		return CL_CLEAN;

 	}

@@ -1260,7 +1260,7 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 #endif

 			fclose(fd);

 #ifdef	SAVE_TMP

-			cli_unlink(tmpfilename);

+			if (cli_unlink(tmpfilename)) return CL_EIO;

 #endif

 			return CL_EMEM;

 		}

@@ -1321,7 +1321,7 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 			signal(SIGSEGV, segv);

 #endif

 #ifdef	SAVE_TMP

-			cli_unlink(tmpfilename);

+			if (cli_unlink(tmpfilename)) return CL_EIO;

 #endif

 			return CL_EMEM;

 		}

@@ -1479,7 +1479,7 @@ cli_parse_mbox(const char *dir, int desc, cli_ctx *ctx)

 #endif

 #ifdef	SAVE_TMP

-	cli_unlink(tmpfilename);

+	if (cli_unlink(tmpfilename)) return CL_EIO;

 #endif

 	return retcode;

 }

@@ -3850,8 +3850,16 @@ rfc1341(message *m, const char *dir)

 							continue;

 						if(stat(fullname, &statb) < 0)

 							continue;

-						if(now - statb.st_mtime > (time_t)(7 * 24 * 3600))

-							cli_unlink(fullname);

+						if(now - statb.st_mtime > (time_t)(7 * 24 * 3600)) {

+							if (cli_unlink(fullname)) {

+								cli_unlink(outname);

+								fclose(fout);

+								free(id);

+								free(number);

+								closedir(dd);

+								return -1;

+							}

+						}

 						continue;

 					}

@@ -3890,9 +3898,17 @@ rfc1341(message *m, const char *dir)

 						}

 					fclose(fin);

-					/* don't cli_unlink if leave temps */

-					if(!cli_leavetemps_flag)

-						cli_unlink(fullname);

+					/* don't unlink if leave temps */

+					if(!cli_leavetemps_flag) {

+						if(cli_unlink(fullname)) {

+							fclose(fout);

+							cli_unlink(outname);

+							free(id);

+							free(number);

+							closedir(dd);

+							return -1;

+						}

+					}

 					break;

 				}

 				rewinddir(dd);

@@ -4393,7 +4409,7 @@ getURL(struct arg *arg)

 					if(location) {

 						char *end;

-						cli_unlink(fout);

+						if (cli_unlink(fout)) return NULL;

 						location += 11;

 						end = location;

 						while(*end && (*end != '\n'))

@@ -571,7 +571,7 @@ int cli_scannulsft(int desc, cli_ctx *ctx, off_t offset) {

 	    ret=cli_magic_scandesc(nsist.ofd, ctx);

 	  close(nsist.ofd);

 	  if(!cli_leavetemps_flag)

-	    cli_unlink(nsist.ofn);

+	    if(cli_unlink(nsist.ofn)) ret = CL_EIO;

 	} else if(ret == CL_EMAXSIZE) {

 	    ret = nsist.solid ? CL_BREAK : CL_SUCCESS;

 	}

@@ -562,9 +562,13 @@ int cli_gentempfd(const char *dir, char **name, int *fd)

 /* Function: unlink

         unlink() with error checking

 */

-void cli_unlink(const char *pathname)

+int cli_unlink(const char *pathname)

 {

-	if (unlink(pathname)) cli_warnmsg("cli_unlink: failure - %s\n", strerror(errno));

+	if (unlink(pathname)==-1) {

+	    cli_warnmsg("cli_unlink: failure - %s\n", strerror(errno));

+	    return 1;

+	}

+	return 0;

 }

 #ifdef	C_WINDOWS

@@ -592,7 +596,7 @@ cli_rmdirs(const char *name)

     }

     if(!S_ISDIR(statb.st_mode)) {

-	cli_unlink(name);

+	if(cli_unlink(name)) return -1;

 	return 0;

     }

@@ -700,8 +704,13 @@ int cli_rmdirs(const char *dirname)

 					return -1;

 				    }

 				}

-			    } else

-				cli_unlink(path); 

+			    } else {

+				if(cli_unlink(path)) {

+				    free(path);

+				    closedir(dd);

+				    return -1;

+				}

+			    }

 			}

 			free(path);

 		    }

@@ -259,7 +259,7 @@ int cli_rmdirs(const char *dirname);

 unsigned char *cli_md5digest(int desc);

 char *cli_md5stream(FILE *fs, unsigned char *digcpy);

 char *cli_md5file(const char *filename);

-void cli_unlink(const char *pathname);

+int cli_unlink(const char *pathname);

 int cli_readn(int fd, void *buff, unsigned int count);

 int cli_writen(int fd, const void *buff, unsigned int count);

 char *cli_gentemp(const char *dir);

@@ -395,7 +395,10 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 		if(streamend <= streamstart) {

 			close(fout);

 			cli_dbgmsg("cli_pdf: Empty stream\n");

-			cli_unlink(fullname);

+			if (cli_unlink(fullname)) {

+				rc = CL_EIO;

+				break;

+			}

 			continue;

 		}

 		calculated_streamlen = (int)(streamend - streamstart);

@@ -421,7 +424,10 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 			if(ret != CL_CLEAN) {

 				close(fout);

-				cli_unlink(fullname);

+				if (cli_unlink(fullname)) {

+					rc = CL_EIO;

+					break;

+				}

 				continue;

 			}

@@ -429,7 +435,10 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 			if(tmpbuf == NULL) {

 				close(fout);

-				cli_unlink(fullname);

+				if (cli_unlink(fullname)) {

+					rc = CL_EIO;

+					break;

+				}

 				continue;

 			}

@@ -438,7 +447,10 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 			if(ret == -1) {

 				free(tmpbuf);

 				close(fout);

-				cli_unlink(fullname);

+				if (cli_unlink(fullname)) {

+					rc = CL_EIO;

+					break;

+				}

 				continue;

 			}

 			if(ret) {

@@ -450,7 +462,10 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 				if(t == NULL) {

 					free(tmpbuf);

 					close(fout);

-					cli_unlink(fullname);

+					if (cli_unlink(fullname)) {

+						rc = CL_EIO;

+						break;

+					}

 					continue;

 				}

 				tmpbuf = t;

@@ -492,7 +507,10 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 				if(tableFind(md5table, md5str) >= 0) {

 					cli_dbgmsg("cli_pdf: not scanning duplicate embedded file '%s'\n", fullname);

 					close(fout);

-					cli_unlink(fullname);

+					if (cli_unlink(fullname)) {

+						rc = CL_EIO;

+						break;

+					}

 					continue;

 				} else

 					tableInsert(md5table, md5str, 1);

@@ -502,7 +520,8 @@ cli_pdf(const char *dir, int desc, cli_ctx *ctx)

 			rc = cli_magic_scandesc(fout, ctx);

 		}

 		close(fout);

-		if(!cli_leavetemps_flag) cli_unlink(fullname);

+		if(!cli_leavetemps_flag)

+			if (cli_unlink(fullname)) rc = CL_EIO;

 		if(rc != CL_CLEAN) break;

 	}

@@ -652,7 +671,10 @@ flatedecode(unsigned char *buf, off_t len, int fout, cli_ctx *ctx)

 	}

 #ifdef	SAVE_TMP

-	cli_unlink(tmpfilename);

+	if (cli_unlink(tmpfilename)) {

+		inflateEnd(&stream);

+		return CL_EIO;

+	}

 #endif

 	inflateEnd(&stream);

 	return CL_CLEAN;

@@ -99,13 +99,23 @@ if((ndesc = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) { \

     return CL_EIO; \

 }

-#define CLI_TMPUNLK() if(!cli_leavetemps_flag) cli_unlink(tempfile)

+#define CLI_TMPUNLK() if(!cli_leavetemps_flag) { \

+    if (cli_unlink(tempfile)) { \

+	free(tempfile); \

+	return CL_EIO; \

+    } \

+}

 #define FSGCASE(NAME,FREESEC) \

     case 0: /* Unpacked and NOT rebuilt */ \

 	cli_dbgmsg(NAME": Successfully decompressed\n"); \

 	close(ndesc); \

-	cli_unlink(tempfile); \

+	if (cli_unlink(tempfile)) { \

+	    free(exe_sections); \

+	    free(tempfile); \

+	    FREESEC; \

+	    return CL_EIO; \

+	} \

 	free(tempfile); \

 	FREESEC; \

 	found = 0; \

@@ -116,7 +126,11 @@ if((ndesc = open(tempfile, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU)) < 0) { \

     case 2: \

 	free(spinned); \

 	close(ndesc); \

-	cli_unlink(tempfile); \

+	if (cli_unlink(tempfile)) { \

+	    free(exe_sections); \

+	    free(tempfile); \

+	    return CL_EIO; \

+	} \

 	cli_dbgmsg("PESpin: Size exceeded\n"); \

 	free(tempfile); \

 	break; \

@@ -148,7 +162,12 @@ FSGSTUFF; \

     default: \

 	cli_dbgmsg(NAME": Unpacking failed\n"); \

 	close(ndesc); \

-	cli_unlink(tempfile); \

+	if (cli_unlink(tempfile)) { \

+	    free(exe_sections); \

+	    free(tempfile); \

+	    cli_multifree FREEME; \

+	    return CL_EIO; \

+	} \

 	cli_multifree FREEME; \

         free(tempfile); \

     }

@@ -252,7 +252,7 @@ static int decode_and_scan(struct rtf_object_data* data, cli_ctx* ctx)

 	data->fd = -1;

 	if(data->name) {

 		if(!cli_leavetemps_flag)

-			cli_unlink(data->name);

+			if(cli_unlink(data->name)) ret = CL_EIO;

 		free(data->name);

 		data->name = NULL;

 	}

@@ -325,7 +325,7 @@ static int cli_scanrar(int desc, cli_ctx *ctx, off_t sfx_offset, uint32_t *sfx_c

 	    rc = cli_magic_scandesc(rar_state.ofd,ctx);

 	    close(rar_state.ofd);

 	    if(!cli_leavetemps_flag) 

-		cli_unlink(rar_state.filename);

+		if (cli_unlink(rar_state.filename)) ret = CL_EIO;

 	    if(rc == CL_VIRUS ) {

 		cli_dbgmsg("RAR: infected with %s\n",*ctx->virname);

 		ret = CL_VIRUS;

@@ -466,9 +466,12 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

 	cli_dbgmsg("GZip: Unable to malloc %u bytes.\n", FILEBUFF);

 	gzclose(gd);

 	close(fd);

-	if(!cli_leavetemps_flag)

-	    cli_unlink(tmpname);

-	free(tmpname);	

+	if(!cli_leavetemps_flag) {

+	    if(cli_unlink(tmpname)) {

+	    	free(tmpname);

+		return CL_EIO;

+	    }

+	}

 	return CL_EMEM;

     }

@@ -481,8 +484,14 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

 	if(cli_writen(fd, buff, bytes) != bytes) {

 	    cli_dbgmsg("GZip: Can't write to file.\n");

 	    close(fd);

-	    if(!cli_leavetemps_flag)

-		cli_unlink(tmpname);

+	    if(!cli_leavetemps_flag) {

+	    	if (cli_unlink(tmpname)) {

+		    free(tmpname);

+		    gzclose(gd);

+		    free(buff);

+		    return CL_EIO;

+		}

+	    }

 	    free(tmpname);	

 	    gzclose(gd);

 	    free(buff);

@@ -496,7 +505,7 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

     if(ret == CL_VIRUS) {

 	close(fd);

 	if(!cli_leavetemps_flag)

-	    cli_unlink(tmpname);

+	    if (cli_unlink(tmpname)) ret = CL_EIO;

 	free(tmpname);	

 	return ret;

     }

@@ -505,14 +514,18 @@ static int cli_scangzip(int desc, cli_ctx *ctx)

     if((ret = cli_magic_scandesc(fd, ctx)) == CL_VIRUS ) {

 	cli_dbgmsg("GZip: Infected with %s\n", *ctx->virname);

 	close(fd);

-	if(!cli_leavetemps_flag)

-	    cli_unlink(tmpname);

+	if(!cli_leavetemps_flag) {

+	    if (cli_unlink(tmpname)) {

+	    	free(tmpname);

+		return CL_EIO;

+	    }

+	}

 	free(tmpname);	

 	return CL_VIRUS;

     }

     close(fd);

     if(!cli_leavetemps_flag)

-	cli_unlink(tmpname);

+	if (cli_unlink(tmpname)) ret = CL_EIO;

     free(tmpname);	

     return ret;

@@ -562,8 +575,14 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

     if(!(buff = (char *) cli_malloc(FILEBUFF))) {

 	cli_dbgmsg("Bzip: Unable to malloc %u bytes.\n", FILEBUFF);

 	close(fd);

-	if(!cli_leavetemps_flag)

-	    cli_unlink(tmpname);

+	if(!cli_leavetemps_flag) {

+	    if (cli_unlink(tmpname)) {

+	    	free(tmpname);

+		fclose(fs);

+		BZ2_bzReadClose(&bzerror, bfd);

+		return CL_EIO;

+	    }

+	}

 	free(tmpname);	

 	fclose(fs);

 	BZ2_bzReadClose(&bzerror, bfd);

@@ -580,8 +599,14 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

 	    cli_dbgmsg("Bzip: Can't write to file.\n");

 	    BZ2_bzReadClose(&bzerror, bfd);

 	    close(fd);

-	    if(!cli_leavetemps_flag)

-		cli_unlink(tmpname);

+	    if(!cli_leavetemps_flag) {

+		if (cli_unlink(tmpname)) {

+		    free(tmpname);

+		    free(buff);

+		    fclose(fs);

+		    return CL_EIO;

+		}

+	    }

 	    free(tmpname);	

 	    free(buff);

 	    fclose(fs);

@@ -595,7 +620,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

     if(ret == CL_VIRUS) {

 	close(fd);

 	if(!cli_leavetemps_flag)

-	    cli_unlink(tmpname);

+	    if (cli_unlink(tmpname)) ret = CL_EIO;

 	free(tmpname);	

 	fclose(fs);

 	return ret;

@@ -607,7 +632,7 @@ static int cli_scanbzip(int desc, cli_ctx *ctx)

     }

     close(fd);

     if(!cli_leavetemps_flag)

-	cli_unlink(tmpname);

+	if (cli_unlink(tmpname)) ret = CL_EIO;

     free(tmpname);	

     fclose(fs);

@@ -634,7 +659,7 @@ static int cli_scanszdd(int desc, cli_ctx *ctx)

     if(ret != CL_SUCCESS) { /* CL_VIRUS or some error */

 	close(ofd);

 	if(!cli_leavetemps_flag)

-	    cli_unlink(tmpname);

+	    if (cli_unlink(tmpname)) ret = CL_EIO;

 	free(tmpname);	

 	return ret;

     }

@@ -644,7 +669,7 @@ static int cli_scanszdd(int desc, cli_ctx *ctx)

     ret = cli_magic_scandesc(ofd, ctx);

     close(ofd);

     if(!cli_leavetemps_flag)

-	cli_unlink(tmpname);

+	if (cli_unlink(tmpname)) ret = CL_EIO;

     free(tmpname);	

     return ret;

@@ -680,8 +705,13 @@ static int cli_scanmscab(int desc, cli_ctx *ctx, off_t sfx_offset)

 	else

 	    ret = cli_scanfile(tempname, ctx);

-	if(!cli_leavetemps_flag)

-	    cli_unlink(tempname);

+	if(!cli_leavetemps_flag) {

+	    if (cli_unlink(tempname)) {

+	    	free(tempname);

+		ret = CL_EIO;

+		break;

+	    }

+	}

 	free(tempname);

 	if(ret == CL_VIRUS)

 	    break;

@@ -1043,7 +1073,7 @@ static int cli_scanhtml_utf16(int desc, cli_ctx *ctx)

     close(fd);

     if(!cli_leavetemps_flag)

-	cli_unlink(tempname);

+	if (cli_unlink(tempname)) ret = CL_EIO;

     else

 	cli_dbgmsg("cli_scanhtml_utf16: Decoded HTML data saved in %s\n", tempname);

     free(tempname);

@@ -1343,7 +1373,7 @@ static int cli_scancryptff(int desc, cli_ctx *ctx)

     if(cli_leavetemps_flag)

 	cli_dbgmsg("CryptFF: Decompressed data saved in %s\n", tempfile);

     else

-	cli_unlink(tempfile);

+	if (cli_unlink(tempfile)) ret = CL_EIO;

     free(tempfile);

     return ret;

@@ -1488,8 +1518,12 @@ static int cli_scanembpe(int desc, cli_ctx *ctx)

 	if(cli_writen(fd, buff, bytes) != bytes) {

 	    cli_dbgmsg("cli_scanembpe: Can't write to temporary file\n");

 	    close(fd);

-	    if(!cli_leavetemps_flag)

-		cli_unlink(tmpname);

+	    if(!cli_leavetemps_flag) {

+		if (cli_unlink(tmpname)) {

+		    free(tmpname);

+		    return CL_EIO;

+		}

+	    }

 	    free(tmpname);	

 	    return CL_EIO;

 	}

@@ -1500,16 +1534,24 @@ static int cli_scanembpe(int desc, cli_ctx *ctx)

     if((ret = cli_magic_scandesc(fd, ctx)) == CL_VIRUS) {

 	cli_dbgmsg("cli_scanembpe: Infected with %s\n", *ctx->virname);

 	close(fd);

-	if(!cli_leavetemps_flag)

-	    cli_unlink(tmpname);

+	if(!cli_leavetemps_flag) {

+	    if (cli_unlink(tmpname)) {

+	    	free(tmpname);

+		return CL_EIO;

+	    }

+	}

 	free(tmpname);	

 	return CL_VIRUS;

     }

     ctx->recursion--;

     close(fd);

-    if(!cli_leavetemps_flag)

-	cli_unlink(tmpname);

+    if(!cli_leavetemps_flag) {

+	if (cli_unlink(tmpname)) {

+	    free(tmpname);

+	    return CL_EIO;

+	}

+    }

     free(tmpname);

     /* intentionally ignore possible errors from cli_magic_scandesc */

@@ -94,7 +94,7 @@ cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)

 				ret = cli_magic_scandesc(fout, ctx);

 				close(fout);

 				if (!cli_leavetemps_flag)

-					cli_unlink(fullname);

+					if (cli_unlink(fullname)) return CL_EIO;

 				if (ret==CL_VIRUS)

 					return CL_VIRUS;

 				fout = -1;

@@ -216,7 +216,7 @@ cli_untar(const char *dir, int desc, unsigned int posix, cli_ctx *ctx)

 		ret = cli_magic_scandesc(fout, ctx);

 		close(fout);

 		if (!cli_leavetemps_flag)

-			cli_unlink(fullname);

+			if (cli_unlink(fullname)) return CL_EIO;

 		if (ret==CL_VIRUS)

 			return CL_VIRUS;

 	}

@@ -284,13 +284,15 @@ static int unz(uint8_t *src, uint32_t csize, uint32_t usize, uint16_t method, ui

     lseek(of, 0, SEEK_SET);

     ret = cli_magic_scandesc(of, ctx);

     close(of);

-    if(!cli_leavetemps_flag) cli_unlink(tempfile);

+    if(!cli_leavetemps_flag)

+      if(cli_unlink(tempfile)) ret = CL_EIO;

     if(!tmpd) free(tempfile);

     return ret;

   }

   close(of);

-  if(!cli_leavetemps_flag) cli_unlink(tempfile);

+  if(!cli_leavetemps_flag)

+    if(cli_unlink(tempfile)) ret = CL_EIO;

   if(!tmpd) free(tempfile);

   cli_dbgmsg("cli_unzip: extraction failed\n");

   return ret;