wimlib_mount_image(): Correctly return NOMEM in one case

[wimlib] / src / mount_image.c

diff --git a/src/mount_image.c b/src/mount_image.c
index 04be3f6f73c8e3ea9b6b87de79959921ee3302b9..41478d92a43dd8566c83c53a3f15bc35ff48c01a 100644 (file)
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -164,7 +164,8 @@ get_lookup_flags(const struct wimfs_context *ctx)
 static inline int
 flags_writable(int open_flags)
 {
-       return open_flags & (O_RDWR | O_WRONLY);
+       int accmode = (open_flags & O_ACCMODE);
+       return (accmode == O_RDWR || accmode == O_WRONLY);
 }
 
 /*
@@ -2475,8 +2476,10 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir,
        DEBUG("Preparing arguments to fuse_main()");
 
        dir_copy = STRDUP(dir);
-       if (!dir_copy)
+       if (!dir_copy) {
+               ret = WIMLIB_ERR_NOMEM;
                goto out_free_message_queue_names;
+       }
 
        argc = 0;
        argv[argc++] = "wimlib";