security.c: align total_length immediately after reading

[wimlib] / src / win32_capture.c

diff --git a/src/win32_capture.c b/src/win32_capture.c
index db2ea0ec7a8afa4a5513abd14730f89da6cd9330..96b373602747c94808ed62b7da4fdfcc8ddc44d3 100644 (file)
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -248,11 +248,11 @@ winnt_get_short_name(HANDLE h, struct wim_dentry *dentry)
                                                FileAlternateNameInformation);
        info = (const FILE_NAME_INFORMATION *)buf;
        if (NT_SUCCESS(status) && info->FileNameLength != 0) {
-               dentry->short_name = utf16le_dupz(info->FileName,
-                                                 info->FileNameLength);
-               if (!dentry->short_name)
+               dentry->d_short_name = utf16le_dupz(info->FileName,
+                                                   info->FileNameLength);
+               if (!dentry->d_short_name)
                        return STATUS_NO_MEMORY;
-               dentry->short_name_nbytes = info->FileNameLength;
+               dentry->d_short_name_nbytes = info->FileNameLength;
        }
        return status;
 }
@@ -1208,10 +1208,10 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
        ACCESS_MASK requestedPerms;
        u64 sort_key;
 
-       ret = try_exclude(full_path, full_path_nchars, params);
-       if (ret < 0) /* Excluded? */
+       ret = try_exclude(full_path, params);
+       if (unlikely(ret < 0)) /* Excluded? */
                goto out_progress;
-       if (ret > 0) /* Error? */
+       if (unlikely(ret > 0)) /* Error? */
                goto out;
 
        /* Open the file.  */