X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwrite.c;h=07b557500b894ae70c770705b10d12500cdae5c2;hp=a852c199670c9a6265cc043be19a6908d98c9ecb;hb=b85695a5f5f50bb0e06f945a2e83cf9dfed08ca7;hpb=5d3d469e410dc5f4a28814ad231336fc174cba56

diff --git a/src/write.c b/src/write.c
index a852c199..07b55750 100644
--- a/src/write.c
+++ b/src/write.c
@@ -1430,11 +1430,11 @@ write_stream_list(struct list_head *stream_list,
 	 * to do compression.  There are serial and parallel implementations of
 	 * the chunk_compressor interface.  We default to parallel using the
 	 * specified number of threads, unless the upper bound on the number
-	 * bytes needing to be compressed is less 2000000 (heuristic value).  */
+	 * bytes needing to be compressed is less than a heuristic value.  */
 	if (out_ctype != WIMLIB_COMPRESSION_TYPE_NONE) {
 
 	#ifdef ENABLE_MULTITHREADED_COMPRESSION
-		if (ctx.num_bytes_to_compress >= 2000000) {
+		if (ctx.num_bytes_to_compress > max(2000000, out_chunk_size)) {
 			ret = new_parallel_chunk_compressor(out_ctype,
 							    out_chunk_size,
 							    num_threads, 0,
@@ -2819,10 +2819,11 @@ wimlib_write(WIMStruct *wim, const tchar *path,
 	     int image, int write_flags, unsigned num_threads,
 	     wimlib_progress_func_t progress_func)
 {
-	if (!path)
+	if (write_flags & ~WIMLIB_WRITE_MASK_PUBLIC)
 		return WIMLIB_ERR_INVALID_PARAM;
 
-	write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
+	if (path == NULL || path[0] == T('\0'))
+		return WIMLIB_ERR_INVALID_PARAM;
 
 	return write_standalone_wim(wim, path, image, write_flags,
 				    num_threads, progress_func);
@@ -2834,10 +2835,12 @@ wimlib_write_to_fd(WIMStruct *wim, int fd,
 		   int image, int write_flags, unsigned num_threads,
 		   wimlib_progress_func_t progress_func)
 {
+	if (write_flags & ~WIMLIB_WRITE_MASK_PUBLIC)
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	if (fd < 0)
 		return WIMLIB_ERR_INVALID_PARAM;
 
-	write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
 	write_flags |= WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR;
 
 	return write_standalone_wim(wim, &fd, image, write_flags,
@@ -3123,7 +3126,10 @@ overwrite_wim_via_tmpfile(WIMStruct *wim, int write_flags,
 		return ret;
 	}
 
-	close_wim(wim);
+	if (filedes_valid(&wim->in_fd)) {
+		filedes_close(&wim->in_fd);
+		filedes_invalidate(&wim->in_fd);
+	}
 
 	/* Rename the new WIM file to the original WIM file.  Note: on Windows
 	 * this actually calls win32_rename_replacement(), not _wrename(), so
@@ -3197,9 +3203,7 @@ wimlib_overwrite(WIMStruct *wim, int write_flags,
 	int ret;
 	u32 orig_hdr_flags;
 
-	write_flags &= WIMLIB_WRITE_MASK_PUBLIC;
-
-	if (write_flags & WIMLIB_WRITE_FLAG_FILE_DESCRIPTOR)
+	if (write_flags & ~WIMLIB_WRITE_MASK_PUBLIC)
 		return WIMLIB_ERR_INVALID_PARAM;
 
 	if (!wim->filename)