Merge branch 'stable' into next

sass · Mar 16, 2018 · 4588331 · 4588331
2 parents ad7760a + 00873b0
commit 4588331
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/doc-src/SASS_CHANGELOG.md b/doc-src/SASS_CHANGELOG.md
@@ -16,6 +16,8 @@
 * Don't crash on custom properties that aren't followed by semicolons.
 
 * Don't crash when normalizing numbers with complex units.
+
+* Don't crash on `$x % 0`.
 
 ## 3.5.5 (4 January 2018)
 

diff --git a/lib/sass/script/value/number.rb b/lib/sass/script/value/number.rb
@@ -189,6 +189,7 @@ def div(other)
     # @raise [Sass::UnitConversionError] if `other` has incompatible units
     def mod(other)
       if other.is_a?(Number)
+        return Number.new(Float::NAN) if other.value == 0
         operate(other, :%)
       else
         raise NoMethodError.new(nil, :mod)