Merge pull request #1 from wildbit/bug/invalid-css-declaration

Fixing null reference exception for an invalid CSS rule.
ActiveCampaign · Jan 3, 2017 · 07d8d51 · 07d8d51
2 parents 8997f7b + 6cb6347
commit 07d8d51
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 2 deletions.
diff --git a/StyleMerge.Tests/InlinerTestFixture.cs b/StyleMerge.Tests/InlinerTestFixture.cs
@@ -104,7 +104,6 @@ public void InlinerShouldNotApplyStylesToHead()
             Assert.Equal(Outputs.universal_selector_doesnt_apply_to_head.EliminateWhitespace(), processed);
         }
 
-
         [Fact]
         public void InlinerShouldProperlyHandleDoubleQuotesInDeclarations()
         {
@@ -119,6 +118,13 @@ public void InlinerShouldMaintainImportantDeclarations()
             Assert.Equal(Outputs.inliner_should_maintain_important_declaration.EliminateWhitespace(), processed);
         }
 
+        [Fact]
+        public void InlinerShouldSkipInvalidCSSDeclarations()
+        {
+            var html = Inliner.ProcessHtml(Inputs.InlinerShouldSkipInvalidCSSDeclarations).EliminateWhitespace();
+            Assert.Equal(Outputs.Expected_InlinerShouldSkipInvalidCSSDeclarations.EliminateWhitespace(), html);
+        }
+
         [Fact]
         public void InlinerCanParseAndInlineEmailACIDTestCSS()
         {

diff --git a/StyleMerge.Tests/Inputs.Designer.cs b/StyleMerge.Tests/Inputs.Designer.cs
diff --git a/StyleMerge.Tests/Inputs.resx b/StyleMerge.Tests/Inputs.resx
@@ -169,4 +169,7 @@
   <data name="inliner_should_maintain_important_stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\inliner_should_maintain_important_stats.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="InlinerShouldSkipInvalidCSSDeclarations" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\InlinerShouldSkipInvalidCSSDeclarations.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>
diff --git a/StyleMerge.Tests/Outputs.Designer.cs b/StyleMerge.Tests/Outputs.Designer.cs
diff --git a/StyleMerge.Tests/Outputs.resx b/StyleMerge.Tests/Outputs.resx
@@ -139,6 +139,9 @@
   <data name="Expected_InlinerShouldKeepMediaQueryStylesInStyleBlocks" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\expected_inlinershouldkeepmediaquerystylesinstyleblocks.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="Expected_InlinerShouldSkipInvalidCSSDeclarations" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\Expected_InlinerShouldSkipInvalidCSSDeclarations.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
   <data name="Expected_Specificity_Ordering_Test" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\expected_specificity_ordering_test.html;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>

diff --git a/StyleMerge.Tests/Resources/Expected_InlinerShouldSkipInvalidCSSDeclarations.html b/StyleMerge.Tests/Resources/Expected_InlinerShouldSkipInvalidCSSDeclarations.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+</head>
+<body>
+    <div style="color: #000" id="foo"></div>
+
+</body>
+</html>
diff --git a/StyleMerge.Tests/Resources/InlinerShouldSkipInvalidCSSDeclarations.html b/StyleMerge.Tests/Resources/InlinerShouldSkipInvalidCSSDeclarations.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+    div {
+        color: #000;
+    }
+
+    #foo
+</style>
+</head>
+<body>
+    <div id="foo"></div>
+</body>
+</html>
diff --git a/StyleMerge.Tests/StyleMerge.Tests.csproj b/StyleMerge.Tests/StyleMerge.Tests.csproj
@@ -112,6 +112,8 @@
     <None Include="Resources\Inliner_Should_Support_PseudoClasses.txt" />
     <None Include="Resources\inliner_should_maintain_important_stats.txt" />
     <None Include="Resources\inliner_should_maintain_important_declaration.txt" />
+    <Content Include="Resources\Expected_InlinerShouldSkipInvalidCSSDeclarations.html" />
+    <Content Include="Resources\InlinerShouldSkipInvalidCSSDeclarations.html" />
     <Content Include="Resources\Specificity_Ordering_Test.html" />
   </ItemGroup>
   <ItemGroup>

diff --git a/StyleMerge/Inliner.cs b/StyleMerge/Inliner.cs
@@ -69,7 +69,7 @@ public static String ProcessHtml(string sourceHtml)
             {
                 var uninlineable = new List<Tuple<string, StyleDeclaration>>();
 
-                var styleRules = styleSheet.Item2.StyleRules.ToArray();
+                var styleRules = styleSheet.Item2.StyleRules.Where(s => s.Selector != null).ToArray();
                 foreach (var s in styleRules)
                 {
                     var selectors = s.Selector.ToString().Split(',').ToLookup(k => true);