guard against invalid games

andrewprock · Nov 23, 2024 · f514713 · f514713
1 parent 511c1da
commit f514713
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/lib/pokerstove/peval/PokerHandEvaluator.test.cpp b/src/lib/pokerstove/peval/PokerHandEvaluator.test.cpp
@@ -9,3 +9,12 @@ TEST(PokerHandEvaluator, OmahaHigh)
     EXPECT_EQ(true, evaluator->usesSuits());
     EXPECT_EQ(5, evaluator->boardSize());
 }
+
+TEST(PokerHandEvaluator, InvalidGame)
+{
+    using namespace pokerstove;
+
+    std::shared_ptr<PokerHandEvaluator> evaluator = PokerHandEvaluator::alloc("x");
+    EXPECT_EQ(nullptr, evaluator);
+}
+
diff --git a/src/lib/pokerstove/peval/PokerHandEvaluator_Alloc.cpp b/src/lib/pokerstove/peval/PokerHandEvaluator_Alloc.cpp
@@ -26,7 +26,7 @@ std::shared_ptr<PokerHandEvaluator> PokerHandEvaluator::alloc (const string & in
 {
   string strid = input;
   boost::algorithm::to_lower(strid); // modifies str
-  std::shared_ptr<PokerHandEvaluator> ret;
+  std::shared_ptr<PokerHandEvaluator> ret = nullptr;
   switch (strid[0])
     {
     case 'h':		//     hold'em
@@ -111,6 +111,8 @@ std::shared_ptr<PokerHandEvaluator> PokerHandEvaluator::alloc (const string & in
       ret.reset (new BadugiHandEvaluator);
       break;
 
+    default:
+      return ret;
     }
 
   ret->_subclassID = strid;