SERVER-70867 Add uassert to handle unsafe usage of value::compareValue

4 files changed, 7 insertions, 1 deletions

diff --git a/src/mongo/db/exec/sbe/stages/sort.cpp b/src/mongo/db/exec/sbe/stages/sort.cpp
index 1443a1d5e67..276c07efaef 100644
--- a/src/mongo/db/exec/sbe/stages/sort.cpp
+++ b/src/mongo/db/exec/sbe/stages/sort.cpp
@@ -136,7 +136,7 @@ void SortStage::makeSorter() {
             auto [lhsTag, lhsVal] = lhs.getViewOfValue(idx);
             auto [rhsTag, rhsVal] = rhs.getViewOfValue(idx);
             auto [tag, val] = value::compareValue(lhsTag, lhsVal, rhsTag, rhsVal);
-
+            uassert(7086700, "Invalid comparison result", tag == value::TypeTags::NumberInt32);
             auto result = value::bitcastTo<int32_t>(val);
             if (result) {
                 return _dirs[idx] == value::SortDirection::Descending ? -result : result;
diff --git a/src/mongo/db/query/optimizer/rewrites/const_eval.cpp b/src/mongo/db/query/optimizer/rewrites/const_eval.cpp
index 010ef21125a..603bf407c93 100644
--- a/src/mongo/db/query/optimizer/rewrites/const_eval.cpp
+++ b/src/mongo/db/query/optimizer/rewrites/const_eval.cpp
@@ -310,6 +310,9 @@ void ConstEval::transport(ABT& n, const BinaryOp& op, ABT& lhs, ABT& rhs) {
 
                     const auto [compareTag, compareVal] =
                         sbe::value::compareValue(lhsTag, lhsVal, rhsTag, rhsVal);
+                    uassert(7086701,
+                            "Invalid comparison result",
+                            compareTag == sbe::value::TypeTags::NumberInt32);
                     const auto cmpVal = sbe::value::bitcastTo<int32_t>(compareVal);
 
                     switch (op.op()) {
diff --git a/src/mongo/db/query/optimizer/syntax/expr.cpp b/src/mongo/db/query/optimizer/syntax/expr.cpp
index 3b340381cb6..0fed04069fa 100644
--- a/src/mongo/db/query/optimizer/syntax/expr.cpp
+++ b/src/mongo/db/query/optimizer/syntax/expr.cpp
@@ -119,6 +119,7 @@ Constant::~Constant() {
 
 bool Constant::operator==(const Constant& other) const {
     const auto [compareTag, compareVal] = compareValue(_tag, _val, other._tag, other._val);
+    uassert(7086702, "Invalid comparison result", compareTag == sbe::value::TypeTags::NumberInt32);
     return sbe::value::bitcastTo<int32_t>(compareVal) == 0;
 }
 
diff --git a/src/mongo/db/query/optimizer/utils/abt_compare.cpp b/src/mongo/db/query/optimizer/utils/abt_compare.cpp
index 77151482d2f..08325dc76a5 100644
--- a/src/mongo/db/query/optimizer/utils/abt_compare.cpp
+++ b/src/mongo/db/query/optimizer/utils/abt_compare.cpp
@@ -95,6 +95,8 @@ private:
         const auto [tag, val] = node.get();
         const auto [otherTag, otherVal] = other.get();
         const auto [compareTag, compareVal] = compareValue(tag, val, otherTag, otherVal);
+        uassert(
+            7086703, "Invalid comparison result", compareTag == sbe::value::TypeTags::NumberInt32);
         return sbe::value::bitcastTo<int32_t>(compareVal);
     }