Ensure that convertWCStringToQString asserts only, when the string is…

… longer, than the specified length
mixxxdj · Feb 26, 2023 · dabdeb2 · dabdeb2
1 parent 1b99e57
commit dabdeb2
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/util/string.h b/src/util/string.h
@@ -80,12 +80,15 @@ inline std::size_t wcsnlen_s(
 /// See also: QString::fromWCharArray()
 inline QString convertWCStringToQString(
         const wchar_t* wcs,
-        std::size_t len) {
+        std::size_t maxLen) {
     if (!wcs) {
-        DEBUG_ASSERT(len == 0);
+        DEBUG_ASSERT(maxLen == 0);
         return QString();
     }
-    DEBUG_ASSERT(wcsnlen_s(wcs, len) == len);
+
+    std::size_t len = wcsnlen(wcs, maxLen + 1);
+    // Assert when the string wcs has more characters than the specified maximum size
+    DEBUG_ASSERT(len <= maxLen);
     const auto ilen = static_cast<int>(len);
     DEBUG_ASSERT(ilen >= 0); // unsigned -> signed
     switch (sizeof(wchar_t)) {