Merge pull request #557 from BenJBailey/master

Fix: If statement comparing string and null value results in object reference error
scriban · Jul 13, 2024 · 3a695be · 3a695be
2 parents 38df149 + 8a2c229
commit 3a695be
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/Scriban.Tests/TestFiles/100-expressions/110-binary-simple.out.txt b/src/Scriban.Tests/TestFiles/100-expressions/110-binary-simple.out.txt
@@ -52,3 +52,5 @@ null != null -> false
 null == 1 -> false
 1 != null -> true
 null != 1 -> true
+"a" == null -> false
+null == "b" -> false
diff --git a/src/Scriban.Tests/TestFiles/100-expressions/110-binary-simple.txt b/src/Scriban.Tests/TestFiles/100-expressions/110-binary-simple.txt
@@ -52,3 +52,5 @@ null != null -> {{ null != null }}
 null == 1 -> {{ null == 1 }}
 1 != null -> {{ 1 != null }}
 null != 1 -> {{ null != 1 }}
+"a" == null -> {{ "a" == null }}
+null == "b" -> {{ null == "b" }}
diff --git a/src/Scriban/Syntax/Expressions/ScriptBinaryExpression.cs b/src/Scriban/Syntax/Expressions/ScriptBinaryExpression.cs
@@ -191,7 +191,11 @@ public static object Evaluate(TemplateContext context, SourceSpan span, ScriptBi
                 case ScriptBinaryOperator.CloseInterpolated:
                     try
                     {
-                        if (leftValue is string || rightValue is string || leftValue is char || rightValue is char)
+                        if (leftValue == null || rightValue == null)
+                        {
+                            return CalculateOthers(context, span, op, leftSpan, leftValue, rightSpan, rightValue);
+                        }
+                        else if (leftValue is string || rightValue is string || leftValue is char || rightValue is char)
                         {
                             if (leftValue is char leftChar) leftValue = leftChar.ToString(context.CurrentCulture);
                             if (rightValue is char rightChar) rightValue = rightChar.ToString(CultureInfo.InvariantCulture);
@@ -484,7 +488,7 @@ private static object CalculateOthers(TemplateContext context, SourceSpan span,
                 switch (op)
                 {
                     case ScriptBinaryOperator.CompareEqual:
-                    	return false;
+                        return false;
                     case ScriptBinaryOperator.CompareNotEqual:
                         return true;