X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fmount_image.c;h=b53dfb5c1196bdb6ba7674b7fb2cf1cdbb5ec0ab;hb=156bb1de48ff4a594f6a2a2f86e86213d65a6b08;hp=934b4450c6bc0f150ed3894a2385561f9e923934;hpb=23e0fbfa065d4f25f41ce145e56765b7bf4bac92;p=wimlib

diff --git a/src/mount_image.c b/src/mount_image.c
index 934b4450..b53dfb5c 100644
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -2416,7 +2416,8 @@ do_unmount_commit(const char *dir, int unmount_flags,
 		ret = do_unmount(dir);
 	if (progfunc) {
 		/* Terminate the progress thread.  */
-		mq_send(mq, NULL, 0, 1);
+		char empty[0];
+		mq_send(mq, empty, 0, 1);
 		pthread_join(commit_progress_tid, NULL);
 	}
 out_delete_mq:
@@ -2477,7 +2478,9 @@ wimlib_unmount_image_with_progress(const char *dir, int unmount_flags,
 	int mount_flags;
 	int ret;
 
-	wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+	ret = wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+	if (ret)
+		return ret;
 
 	if (unmount_flags & ~(WIMLIB_UNMOUNT_FLAG_CHECK_INTEGRITY |
 			      WIMLIB_UNMOUNT_FLAG_COMMIT |