commit 4f88853412a037c379c5c22cfe5c3bf76cc03144
author John Kessenich <cepheus@frii.com> Sun May 27 19:53:20 2018 -0600
committer John Kessenich <cepheus@frii.com> Sun May 27 19:53:20 2018 -0600
tree 63d6a30d679a54399b7bca379e9644b452c95a7d
parent b91189dbe55ec0a9605f20bd48376a5323eccc98

Fix #1391: Remove use of nonportable strnlen().

glslang/MachineIndependent/intermOut.cpp

diff --git a/glslang/MachineIndependent/intermOut.cpp b/glslang/MachineIndependent/intermOut.cpp
index 883bc03..17c5b42 100755
--- a/glslang/MachineIndependent/intermOut.cpp
+++ b/glslang/MachineIndependent/intermOut.cpp
@@ -1111,11 +1111,11 @@
         const char* format = "%f";
         if (fabs(value) > 0.0 && (fabs(value) < 1e-5 || fabs(value) > 1e12))
             format = "%-.13e";
-        snprintf(buf, maxSize, format, value);
+        int len = snprintf(buf, maxSize, format, value);
+        assert(len < maxSize);
 
         // remove a leading zero in the 100s slot in exponent; it is not portable
         // pattern:   XX...XXXe+0XX or XX...XXXe-0XX
-        int len = (int)strnlen(buf, maxSize);
         if (len > 5) {
             if (buf[len-5] == 'e' && (buf[len-4] == '+' || buf[len-4] == '-') && buf[len-3] == '0') {
                 buf[len-3] = buf[len-2];