Remove invalid metadata protection from presets

yck1509 · Dec 6, 2015 · 672b431 · 672b431
1 parent bf2368f
commit 672b431
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Confuser.Core/Marker.cs b/Confuser.Core/Marker.cs
@@ -52,7 +52,7 @@ public virtual void Initalize(IList<Protection> protections, IList<Packer> packe
 		/// <param name="settings">The settings.</param>
 		void FillPreset(ProtectionPreset preset, ProtectionSettings settings) {
 			foreach (Protection prot in protections.Values)
-				if (prot.Preset <= preset && !settings.ContainsKey(prot))
+				if (prot.Preset != ProtectionPreset.None && prot.Preset <= preset && !settings.ContainsKey(prot))
 					settings.Add(prot, new Dictionary<string, string>());
 		}
 

diff --git a/Confuser.Core/ObfAttrParser.cs b/Confuser.Core/ObfAttrParser.cs
@@ -126,7 +126,7 @@ public void ParseProtectionString(IDictionary<ConfuserComponent, Dictionary<stri
 
 						var preset = (ProtectionPreset)Enum.Parse(typeof(ProtectionPreset), buffer.ToString(), true);
 						foreach (var item in items.Values.OfType<Protection>().Where(prot => prot.Preset <= preset)) {
-							if (settings != null && !settings.ContainsKey(item))
+							if (prot.Preset != ProtectionPreset.None && settings != null && !settings.ContainsKey(item))
 								settings.Add(item, new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase));
 						}
 						buffer.Length = 0;

diff --git a/Confuser.Protections/InvalidMetadataProtection.cs b/Confuser.Protections/InvalidMetadataProtection.cs
@@ -29,7 +29,7 @@ public override string FullId {
 		}
 
 		public override ProtectionPreset Preset {
-			get { return ProtectionPreset.Maximum; }
+			get { return ProtectionPreset.None; }
 		}
 
 		protected override void Initialize(ConfuserContext context) {