From 2309a52671290a01c96a62a8e4e04262e149e62a Mon Sep 17 00:00:00 2001 From: looterz Date: Wed, 17 Feb 2016 15:31:12 -0600 Subject: [PATCH] Fixed c4996 compiler warning/error due to use of strncpy --- extensions/break_line/ace_break_line.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/extensions/break_line/ace_break_line.cpp b/extensions/break_line/ace_break_line.cpp index 7644748378..c408ceab5c 100644 --- a/extensions/break_line/ace_break_line.cpp +++ b/extensions/break_line/ace_break_line.cpp @@ -13,6 +13,7 @@ #include "shared.hpp" +#include #include #include #include @@ -56,23 +57,16 @@ std::string addLineBreaks(const std::vector &words) { } } } - + return sstream.str(); } -// i like to live dangerously. jk, fix strncpy sometime pls. -#pragma warning( push ) -#pragma warning( disable : 4996 ) - void __stdcall RVExtension(char *output, int outputSize, const char *function) { ZERO_OUTPUT(); if (!strcmp(function, "version")) { - strncpy(output, ACE_FULL_VERSION_STR, outputSize); + strncpy_s(output, outputSize, ACE_FULL_VERSION_STR, _TRUNCATE); } else { - strncpy(output, addLineBreaks(splitString(function)).c_str(), outputSize); - output[outputSize - 1] = '\0'; + strncpy_s(output, outputSize, addLineBreaks(splitString(function)).c_str(), _TRUNCATE); } EXTENSION_RETURN(); } - -#pragma warning( pop )