fix C26451 warnning in serializer.hpp for VS2019

59cb4c93 · chenguoping · 0feea616 · 59cb4c93 · 59cb4c93
Commit 59cb4c93 authored Mar 23, 2020 by chenguoping
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

include/nlohmann/detail/output/serializer.hpp include/nlohmann/detail/output/serializer.hpp +3 -1

single_include/nlohmann/json.hpp single_include/nlohmann/json.hpp +3 -1

No files found.
--- a/include/nlohmann/detail/output/serializer.hpp
+++ b/include/nlohmann/detail/output/serializer.hpp
@@ -807,7 +807,9 @@ class serializer
                ? (byte & 0x3fu) | (codep << 6u)
                : (0xFFu >> type) & (byte);

-        state = utf8d[256u + state * 16u + type];
+        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        assert(0 <= index and index < 400);
+        state = utf8d[index];
        return state;
    }


--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -14552,7 +14552,9 @@ class serializer
                ? (byte & 0x3fu) | (codep << 6u)
                : (0xFFu >> type) & (byte);

-        state = utf8d[256u + state * 16u + type];
+        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        assert(0 <= index and index < 400);
+        state = utf8d[index];
        return state;
    }