[Bf-blender-cvs] [bc6f439e94a] master: CUDA Wrangler: Fix strict compiler warning

Sergey Sharybin noreply at git.blender.org
Wed Oct 9 16:36:34 CEST 2019


Commit: bc6f439e94a56be4e52e588593a0d8003f8d65e5
Author: Sergey Sharybin
Date:   Mon Oct 7 14:19:19 2019 +0200
Branches: master
https://developer.blender.org/rBbc6f439e94a56be4e52e588593a0d8003f8d65e5

CUDA Wrangler: Fix strict compiler warning

Namely addresses -Wstringop-truncation

Not sure if there is anything to be done for strncpy.

Differential Revision: https://developer.blender.org/D6006

===================================================================

M	extern/cuew/src/cuew.c
M	release/scripts/addons

===================================================================

diff --git a/extern/cuew/src/cuew.c b/extern/cuew/src/cuew.c
index 1f386c4e5d3..a0146741494 100644
--- a/extern/cuew/src/cuew.c
+++ b/extern/cuew/src/cuew.c
@@ -859,6 +859,23 @@ int cuewNvrtcVersion(void) {
   return 0;
 }
 
+static size_t safe_strnlen(const char *s, size_t maxlen) {
+  size_t length;
+  for (length = 0; length < maxlen; s++, length++) {
+    if (*s == '\0') {
+      break;
+    }
+  }
+  return length;
+}
+
+static char *safe_strncpy(char *dest, const char *src, size_t n) {
+  const size_t src_len = safe_strnlen(src, n - 1);
+  memcpy(dest, src, src_len);
+  dest[src_len] = '\0';
+  return dest;
+}
+
 int cuewCompilerVersion(void) {
   const char *path = cuewCompilerPath();
   const char *marker = "Cuda compilation tools, release ";
@@ -874,7 +891,7 @@ int cuewCompilerVersion(void) {
   }
 
   /* get --version output */
-  strncpy(command, path, sizeof(command));
+  safe_strncpy(command, path, sizeof(command));
   strncat(command, " --version", sizeof(command) - strlen(path));
   pipe = popen(command, "r");
   if (!pipe) {
diff --git a/release/scripts/addons b/release/scripts/addons
index a17cabe4c99..120d31a17c0 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit a17cabe4c9976547b20078149a99c9bb58152d1d
+Subproject commit 120d31a17c0eb571420b828425fc1fe6ef13db2d



More information about the Bf-blender-cvs mailing list