Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel

shared/cdiff.c

@@ -944,6 +944,7 @@ int cdiff_apply(int fd, unsigned short mode)
 			    free(r1);
 			    free(lbuf);
 			}
+			close(desc);
 			return -1;
 		    }
 		    line = r1;
@@ -958,6 +959,7 @@ int cdiff_apply(int fd, unsigned short mode)
 		gzclose(gzh);
 		free(line);
 		free(lbuf);
+		close(desc);
 		return -1;
 	    } else {
 		cmds++;
@@ -1005,6 +1007,7 @@ int cdiff_apply(int fd, unsigned short mode)
 			    free(r1);
 			    free(lbuf);
 			}
+			close(desc);
 			return -1;
 		    }
 		    line = r1;
@@ -1019,6 +1022,7 @@ int cdiff_apply(int fd, unsigned short mode)
 		fclose(fh);
 		free(line);
 		free(lbuf);
+		close(desc);
 		return -1;
 	    } else {
 		cmds++;
@@ -1038,5 +1042,6 @@ int cdiff_apply(int fd, unsigned short mode)
     }
 
     logg("*cdiff_apply: Parsed %d lines and executed %d commands\n", lines, cmds);
+    close(desc);
     return 0;
 }