Updated glslang.

2020-10-11 20:48:21 -07:00 · 2020-10-11 20:48:21 -07:00 · f38b4b0daf
parent 8c2b99d81e
commit f38b4b0daf
1 changed files with 9 additions and 1 deletions
--- a/3rdparty/glslang/SPIRV/SPVRemapper.cpp
+++ b/3rdparty/glslang/SPIRV/SPVRemapper.cpp
@ -830,7 +830,15 @@ namespace spv {
            [&](spv::Id& id) {
                if (thisOpCode != spv::OpNop) {
                    ++idCounter;
-                    const std::uint32_t hashval = opCounter[thisOpCode] * thisOpCode * 50047 + idCounter + fnId * 117;
+                    const std::uint32_t hashval =
+                        // Explicitly cast operands to unsigned int to avoid integer
+                        // promotion to signed int followed by integer overflow,
+                        // which would result in undefined behavior.
+                        static_cast<unsigned int>(opCounter[thisOpCode])
+                        * thisOpCode
+                        * 50047
+                        + idCounter
+                        + static_cast<unsigned int>(fnId) * 117;

                    if (isOldIdUnmapped(id))
                        localId(id, nextUnusedId(hashval % softTypeIdLimit + firstMappedID));