Merge pull request #1969 from dota17/dota17-warning

fix warnings in serializer.hpp for VS2019
nlohmann · Apr 17, 2020 · 3bc9e05 · 3bc9e05
2 parents 69ac336 + 59cb4c9
commit 3bc9e05
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/include/nlohmann/detail/output/serializer.hpp b/include/nlohmann/detail/output/serializer.hpp
@@ -861,7 +861,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;
     }
 

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -15494,7 +15494,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;
     }