Clean-up: lttng-ctl: strnlen out of bounds access

[lttng-tools.git] / src / common / macros.h

diff --git a/src/common/macros.h b/src/common/macros.h
index 6b8eaf711df21e99612956d1723606bca01c1dff..8c35f0c5f3a297144df3259d084518c63f55e732 100644 (file)
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -115,12 +115,14 @@ void *zmalloc(size_t len)
  * It checks that the @src string fits into @dst_len before performing
  * the copy. On failure, no copy has been performed.
  *
+ * Assumes that 'src' is null-terminated.
+ *
  * dst_len includes the string's trailing NULL.
  */
 static inline
 int lttng_strncpy(char *dst, const char *src, size_t dst_len)
 {
-       if (lttng_strnlen(src, dst_len) >= dst_len) {
+       if (strlen(src) >= dst_len) {
                /* Fail since copying would result in truncation. */
                return -1;
        }