test-imagex-ntfs: Try to work around yet another race condition

[wimlib] / src / win32_capture.c

diff --git a/src/win32_capture.c b/src/win32_capture.c
index fa3f04fbff8ef28235c9df2e690e3684669089dd..71e6c840ab3c6f7f9186768813f2272778fbb25f 100644 (file)
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -110,6 +110,9 @@ win32_encrypted_export_cb(unsigned char *data, void *_ctx, unsigned long len)
        int ret;
        size_t bytes_to_consume = min(len, ctx->bytes_remaining);
 
+       if (bytes_to_consume == 0)
+               return ERROR_SUCCESS;
+
        ret = (*ctx->read_prefix_cb)(data, bytes_to_consume, ctx->read_prefix_ctx);
        if (ret) {
                ctx->wimlib_err_code = ret;
@@ -1123,7 +1126,7 @@ win32_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                                  unsigned vol_flags)
 {
        struct wim_dentry *root = NULL;
-       struct wim_inode *inode;
+       struct wim_inode *inode = NULL;
        DWORD err;
        u64 file_size;
        int ret;