key: fix aes keys split not working correctly

mandarine3ds · Sep 22, 2024 · 5cf9dc9 · 5cf9dc9
1 parent f5bc85e
commit 5cf9dc9
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/core/hw/aes/key.cpp b/src/core/hw/aes/key.cpp
@@ -53,13 +53,15 @@ std::vector<u8> HexToVector(const std::string& hex) {
 
 std::optional<std::size_t> ParseCommonKeyName(const std::string& full_name) {
     std::size_t index;
+    const char* start = full_name.c_str();
     int end;
-    if (std::sscanf(full_name.c_str(), "common%zd%n", &index, &end) == 1 &&
-        end == static_cast<int>(full_name.size())) {
-        return index;
-    } else {
-        return std::nullopt;
+    if (std::sscanf(start, "common%zd%n", &index, &end) == 1) {
+        if (end == static_cast<int>(full_name.size()) || !std::isdigit(full_name[end])) {
+            return index;
+        }
     }
+
+    return std::nullopt;
 }
 
 std::optional<std::pair<std::size_t, std::string>> ParseNfcSecretName(