fix: fix custom form empty dropdown crash

LiteLDev · Oct 12, 2024 · 994788f · 994788f
1 parent da55b0e
commit 994788f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src-server/ll/api/form/CustomForm.cpp b/src-server/ll/api/form/CustomForm.cpp
@@ -118,7 +118,14 @@ class Dropdown : public CustomFormElement {
     }
 
     [[nodiscard]] CustomFormElementResult parseResult(nlohmann::ordered_json const& data) const override {
-        return mOptions[data.get<int>()];
+        if (!data.is_number_integer()) {
+            return std::string{};
+        }
+        int index = data.get<int>();
+        if (index < 0 || index >= static_cast<int>(mOptions.size())) {
+            return std::string{};
+        }
+        return mOptions[index];
     }
 };
 
@@ -220,7 +227,14 @@ class StepSlider : public CustomFormElement {
     }
 
     [[nodiscard]] CustomFormElementResult parseResult(nlohmann::ordered_json const& data) const override {
-        return mSteps[data.get<int>()];
+        if (!data.is_number_integer()) {
+            return std::string{};
+        }
+        int index = data.get<int>();
+        if (index < 0 || index >= static_cast<int>(mSteps.size())) {
+            return std::string{};
+        }
+        return mSteps[index];
     }
 };
 

diff --git a/src-test/server/FormTest.cpp b/src-test/server/FormTest.cpp
@@ -31,14 +31,16 @@ void registerFormTestCommand() {
         [](CommandOrigin const& ori, CommandOutput&, TestFormParam const& param) {
             switch (param.type) {
             case TestFormParam::FormType::custom: {
-                ll::form::CustomForm form;
+                ll::form::CustomForm     form;
+                std::vector<std::string> names;
                 form.setTitle("CustomForm")
                     .appendLabel("label")
                     .appendInput("input1", "input")
                     .appendToggle("toggle", "toggle")
                     .appendSlider("slider", "slider", 0, 100, 1)
                     .appendStepSlider("stepSlider", "stepSlider", {"a", "b", "c"})
                     .appendDropdown("dropdown", "dropdown", {"a", "b", "c"})
+                    .appendDropdown("emptydropdown", "empty dropdown", names)
                     .sendTo(
                         *(Player*)ori.getEntity(),
                         [](Player&, ll::form::CustomFormResult const& data, ll::form::FormCancelReason) {