config: return an error on an invalid hex value

hyprwm · Sep 1, 2024 · e830700 · e830700
1 parent 38d0680
commit e830700
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 23 deletions.
diff --git a/src/config.cpp b/src/config.cpp
@@ -1,6 +1,7 @@
 #include "config.hpp"
 #include <filesystem>
 #include <fstream>
+#include <stdexcept>
 #include <string>
 #include <format>
 #include <algorithm>
@@ -160,14 +161,19 @@ void CConfig::commence() {
 }
 
 static std::expected<int64_t, std::string> configStringToInt(const std::string& VALUE) {
+    auto parseHex = [](const std::string& value) -> std::expected<int64_t, std::string> {
+        try {
+            size_t position;
+            auto   result = stoll(value, &position, 16);
+            if (position == value.size())
+                return result;
+        } catch (std::out_of_range) { return std::unexpected("hex " + value + " is too big"); } catch (...) {
+        }
+        return std::unexpected("invalid hex " + value);
+    };
     if (VALUE.starts_with("0x")) {
         // Values with 0x are hex
-        size_t position;
-        auto   result = stoll(VALUE, &position, 16);
-        if (position == VALUE.size())
-            return result;
-
-        return std::unexpected("invalid hex " + VALUE);
+        return parseHex(VALUE);
     } else if (VALUE.starts_with("rgba(") && VALUE.ends_with(')')) {
         const auto VALUEWITHOUTFUNC = trim(VALUE.substr(5, VALUE.length() - 6));
 
@@ -191,10 +197,13 @@ static std::expected<int64_t, std::string> configStringToInt(const std::string&
 
             return a * (Hyprlang::INT)0x1000000 + r.value() * (Hyprlang::INT)0x10000 + g.value() * (Hyprlang::INT)0x100 + b.value();
         } else if (VALUEWITHOUTFUNC.length() == 8) {
-            const auto RGBA = std::stoll(VALUEWITHOUTFUNC, nullptr, 16);
+            const auto RGBA = parseHex(VALUEWITHOUTFUNC);
+
+            if (!RGBA.has_value())
+                return RGBA;
 
             // now we need to RGBA -> ARGB. The config holds ARGB only.
-            return (RGBA >> 8) + 0x1000000 * (RGBA & 0xFF);
+            return (RGBA.value() >> 8) + 0x1000000 * (RGBA.value() & 0xFF);
         }
 
         return std::unexpected("rgba() expects length of 8 characters (4 bytes) or 4 comma separated values");
@@ -217,9 +226,12 @@ static std::expected<int64_t, std::string> configStringToInt(const std::string&
 
             return (Hyprlang::INT)0xFF000000 + r.value() * (Hyprlang::INT)0x10000 + g.value() * (Hyprlang::INT)0x100 + b.value();
         } else if (VALUEWITHOUTFUNC.length() == 6) {
-            const auto RGB = std::stoll(VALUEWITHOUTFUNC, nullptr, 16);
+            const auto RGB = parseHex(VALUEWITHOUTFUNC);
+
+            if (!RGB.has_value())
+                return RGB;
 
-            return RGB + 0xFF000000;
+            return RGB.value() + 0xFF000000;
         }
 
         return std::unexpected("rgb() expects length of 6 characters (3 bytes) or 3 comma separated values");

diff --git a/tests/config/error2.conf b/tests/config/error2.conf
diff --git a/tests/config/invalid-numbers.conf b/tests/config/invalid-numbers.conf
@@ -0,0 +1,15 @@
+# Every number/color in this file is invalid
+
+invalidHex = 0x1Q
+emptyHex = 0x
+hugeHex = 0xFFFFFFFFFFFFFFFF
+
+invalidInt = 1A
+emptyInt =
+
+invalidColor = rgb(ABCDEQ)
+invalidFirstCharColor = rgb(QABCDE)
+
+invalidColorAlpha = rgba(9ABCDEFQ)
+invalidFirstCharColorAlpha = rgba(Q9ABCDEF)
+
diff --git a/tests/parse/main.cpp b/tests/parse/main.cpp
@@ -279,17 +279,24 @@ int main(int argc, char** argv, char** envp) {
         const auto ERRORSTR = std::string{ERRORS.getError()};
         EXPECT(std::count(ERRORSTR.begin(), ERRORSTR.end(), '\n'), 1);
 
-        std::cout << " → Testing error2.conf\n";
-        Hyprlang::CConfig errorConfig2("./config/error2.conf", {.throwAllErrors = true});
-        errorConfig2.addConfigValue("invalidHex", (Hyprlang::INT)0);
-        errorConfig2.addConfigValue("emptyHex", (Hyprlang::INT)0);
-
-        errorConfig2.commence();
-        const auto ERRORS2 = errorConfig2.parse();
+        std::cout << " → Testing invalid-numbers.conf\n";
+        Hyprlang::CConfig invalidNumbersConfig("./config/invalid-numbers.conf", {.throwAllErrors = true});
+        invalidNumbersConfig.addConfigValue("invalidHex", (Hyprlang::INT)0);
+        invalidNumbersConfig.addConfigValue("emptyHex", (Hyprlang::INT)0);
+        invalidNumbersConfig.addConfigValue("hugeHex", (Hyprlang::INT)0);
+        invalidNumbersConfig.addConfigValue("invalidInt", (Hyprlang::INT)0);
+        invalidNumbersConfig.addConfigValue("emptyInt", (Hyprlang::INT)0);
+        invalidNumbersConfig.addConfigValue("invalidColor", (Hyprlang::INT)0);
+        invalidNumbersConfig.addConfigValue("invalidFirstCharColor", (Hyprlang::INT)0);
+        invalidNumbersConfig.addConfigValue("invalidColorAlpha", (Hyprlang::INT)0);
+        invalidNumbersConfig.addConfigValue("invalidFirstCharColorAlpha", (Hyprlang::INT)0);
+
+        invalidNumbersConfig.commence();
+        const auto ERRORS2 = invalidNumbersConfig.parse();
 
         EXPECT(ERRORS2.error, true);
         const auto ERRORSTR2 = std::string{ERRORS2.getError()};
-        EXPECT(std::count(ERRORSTR2.begin(), ERRORSTR2.end(), '\n'), 1);
+        EXPECT(std::count(ERRORSTR2.begin(), ERRORSTR2.end(), '\n'), 9 - 1);
     } catch (const char* e) {
         std::cout << Colors::RED << "Error: " << Colors::RESET << e << "\n";
         return 1;