@@ -950,18 +950,18 @@ int cli_dumpscan(int fd, off_t offset, size_t size, cli_ctx *ctx)

 	if((uint32_t) (sum + bread) >= size) {

 	    if(write(newfd, buff, size - sum) == -1) {

 		cli_errmsg("cli_dumpscan: Can't write to %s\n", name);

+		close(newfd);

 		cli_unlink(name);

 		free(name);

-		close(newfd);

 		return CL_EWRITE;

 	    }

 	    break;

 	} else {

 	    if(write(newfd, buff, bread) == -1) {

 		cli_errmsg("cli_dumpscan: Can't write to %s\n", name);

+		close(newfd);

 		cli_unlink(name);

 		free(name);

-		close(newfd);

 		return CL_EWRITE;

 	    }

 	}

@@ -250,10 +250,10 @@ static int utf16decode(const struct optstruct *opts)

 	    if(write(fd2, decoded, strlen(decoded)) == -1) {

 		mprintf("!utf16decode: Can't write to file %s\n", newname);

 		free(decoded);

-		unlink(newname);

-		free(newname);

 		close(fd1);

 		close(fd2);

+		unlink(newname);

+		free(newname);

 		return -1;

 	    }

 	    free(decoded);