From: Eric Biggers <ebiggers3@gmail.com>
Date: Wed, 18 Feb 2015 02:36:05 +0000 (-0600)
Subject: Do not use ADS entry workaround on encrypted files
X-Git-Tag: v1.8.0~9
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=65adcad3e3d5eb01aaaf0dab9d3e509364dac673

Do not use ADS entry workaround on encrypted files
---

diff --git a/src/dentry.c b/src/dentry.c
index e351a65c..324fbcf8 100644
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -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