X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.c;h=324fbcf8a63b4f72dba20625fa927d6cbcaf48c4;hp=38b4efa60291db98cae4620e268153b1e2b8ec95;hb=65adcad3e3d5eb01aaaf0dab9d3e509364dac673;hpb=b5fae0e5ddac332b25856e3df7556aa3ee7f69fb

diff --git a/src/dentry.c b/src/dentry.c
index 38b4efa6..324fbcf8 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -58,6 +58,8 @@
 #  include "config.h"
 #endif
 
+#include <errno.h>
+
 #include "wimlib/assert.h"
 #include "wimlib/dentry.h"
 #include "wimlib/inode.h"
@@ -66,8 +68,6 @@
 #include "wimlib/metadata.h"
 #include "wimlib/paths.h"
 
-#include <errno.h>
-
 /* On-disk format of a WIM dentry (directory entry), located in the metadata
  * resource for a WIM image.  */
 struct wim_dentry_on_disk {
@@ -348,14 +348,28 @@ ads_entry_out_total_length(const struct wim_ads_entry *entry)
  * though there is already a field in the dentry itself for the unnamed stream
  * reference, which then goes to waste.
  */
-static inline bool
+static bool
 inode_needs_dummy_stream(const struct wim_inode *inode)
 {
-	return (inode->i_num_ads > 0 &&
-		inode->i_num_ads < 0xffff && /* overflow check */
-		inode->i_canonical_streams); /* assume the dentry is okay if it
-						already had an unnamed ADS entry
-						when it was read in  */
+	/* Normal case  */
+	if (likely(inode->i_num_ads <= 0))
+		return false;
+
+	/* Overflow check  */
+	if (inode->i_num_ads >= 0xFFFF)
+		return false;
+
+	/* Assume the dentry is okay if it already had an unnamed ADS entry when
+	 * it was read in.  */
+	if (!inode->i_canonical_streams)
+		return false;
+
+	/* We can't use use this workaround on encrypted files because WIMGAPI
+	 * reports that the WIM is in an incorrect format.  */
+	if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED)
+		return false;
+
+	return true;
 }
 
 /* Calculate the total number of bytes that will be consumed when a dentry is