fix interpreting optional with 0 value as true in checks (#281)

ilnurkh · web-flow · commit 37a5409e3430 · 2026-03-10T18:27:48.000+03:00
diff --git a/src/filters.cpp b/src/filters.cpp
@@ -486,7 +486,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte
     switch (m_mode)
     {
         case FirstItemMode:
-            if (listSize)
+            if (listSize && *listSize > 0)
                 result = ProtectedValue( list.GetValueByIndex(0) );
             else
             {
@@ -496,7 +496,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte
             }
             break;
         case LastItemMode:
-            if (listSize)
+            if (listSize && *listSize > 0)
                 result = ProtectedValue(list.GetValueByIndex(listSize.value() - 1));
             else
             {
@@ -507,7 +507,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte
             }
             break;
         case LengthMode:
-            if (listSize)
+            if (listSize && *listSize > 0)
                 result = static_cast<int64_t>(listSize.value());
             else
                 result = static_cast<int64_t>(std::distance(list.begin(), list.end()));
@@ -516,7 +516,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte
         {
             std::random_device rd;
             std::mt19937 gen(rd());
-            if (listSize)
+            if (listSize && *listSize > 0)
             {
                 std::uniform_int_distribution<> dis(0, static_cast<int>(listSize.value()) - 1);
                 result = ProtectedValue(list.GetValueByIndex(dis(gen)));

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte`
`486`	`486`	`switch (m_mode)`
`487`	`487`	`{`
`488`	`488`	`case FirstItemMode:`
`489`		`- if (listSize)`
	`489`	`+ if (listSize && *listSize > 0)`
`490`	`490`	`result = ProtectedValue( list.GetValueByIndex(0) );`
`491`	`491`	`else`
`492`	`492`	`{`
`@@ -496,7 +496,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte`
`496`	`496`	`}`
`497`	`497`	`break;`
`498`	`498`	`case LastItemMode:`
`499`		`- if (listSize)`
	`499`	`+ if (listSize && *listSize > 0)`
`500`	`500`	`result = ProtectedValue(list.GetValueByIndex(listSize.value() - 1));`
`501`	`501`	`else`
`502`	`502`	`{`
`@@ -507,7 +507,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte`
`507`	`507`	`}`
`508`	`508`	`break;`
`509`	`509`	`case LengthMode:`
`510`		`- if (listSize)`
	`510`	`+ if (listSize && *listSize > 0)`
`511`	`511`	`result = static_cast<int64_t>(listSize.value());`
`512`	`512`	`else`
`513`	`513`	`result = static_cast<int64_t>(std::distance(list.begin(), list.end()));`
`@@ -516,7 +516,7 @@ InternalValue SequenceAccessor::Filter(const InternalValue& baseVal, RenderConte`
`516`	`516`	`{`
`517`	`517`	`std::random_device rd;`
`518`	`518`	`std::mt19937 gen(rd());`
`519`		`- if (listSize)`
	`519`	`+ if (listSize && *listSize > 0)`
`520`	`520`	`{`
`521`	`521`	`std::uniform_int_distribution<> dis(0, static_cast<int>(listSize.value()) - 1);`
`522`	`522`	`result = ProtectedValue(list.GetValueByIndex(dis(gen)));`