Merge 84a8bb6 into 5432cb8

srz-zumix · Apr 6, 2023 · 2b19bb8 · 2b19bb8
2 parents 5432cb8 + 84a8bb6
commit 2b19bb8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/include/internal/iutest_string.hpp b/include/internal/iutest_string.hpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2011-2021, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2023, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -140,12 +140,13 @@ inline int iu_vsnprintf(char* dst, size_t size, const char* format, va_list va)
 {
     char buffer[4096] = {0};
     char* write_buffer = dst != NULL && size >= 4096 ? dst : buffer;
-    const int ret = vsprintf(write_buffer, format, va);
+    const int ret = vsnprintf(write_buffer, size, format, va);
     if( dst != NULL )
     {
         const size_t length = static_cast<size_t>(ret);
         const size_t write = (size <= length) ? size - 1 : length;
-        if( write_buffer == buffer ) {
+        if( write_buffer == buffer )
+        {
             strncpy(dst, buffer, write);
         }
         dst[write] = '\0';

diff --git a/include/internal/iutest_string_stream.hpp b/include/internal/iutest_string_stream.hpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2011-2021, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2023, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -230,8 +230,7 @@ IUTEST_PRAGMA_WARN_DISABLE_FORMAT_NONLITERAL()
         static int vastring(E* dst, const E* fmt, va_list va);
         static int vastring(char* dst, size_t len, const char* fmt, va_list va) IUTEST_ATTRIBUTE_FORMAT_PRINTF(3, 0)
         {
-            (void)len;
-            return vsprintf(dst, fmt, va);
+            return vsnprintf(dst, len, fmt, va);
         }
         static int vastring(wchar_t* dst, size_t len, const wchar_t* fmt, va_list va)
         {

diff --git a/test/assertion_only_tests.cpp b/test/assertion_only_tests.cpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2012-2022, Takazumi Shirayanagi\n
+ * Copyright (C) 2012-2023, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -42,7 +42,7 @@ void test_vprintf(const char* fmt, va_list va)
 {
 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
     char buf[4096];
-    vsprintf(buf, fmt, va);
+    vsnprintf(buf, sizeof(buf), fmt, va);
     s_outstream << buf;
 IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
 }

diff --git a/test/logger_tests.hpp b/test/logger_tests.hpp
@@ -6,7 +6,7 @@
  *
  * @author      t.shirayanagi
  * @par         copyright
- * Copyright (C) 2014-2020, Takazumi Shirayanagi\n
+ * Copyright (C) 2014-2023, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -31,7 +31,7 @@ IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
         char buf[4096] = { 0 };
         va_list va2;
         iu_va_copy(va2, va);
-        vsprintf(buf, fmt, va2);
+        vsnprintf(buf, sizeof(buf), fmt, va2);
         va_end(va2);
         m_log += buf;
         ::iutest::detail::iuConsole::nl_voutput(fmt, va);