Merge branch 'master' of github.com:BehaviorTree/BehaviorTree.CPP

Author: facontidavide

src/xml_parsing.cpp

@@ -10,6 +10,7 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#include <cstdio>
 #include <cstring>
 #include <functional>
 #include <iostream>
@@ -23,10 +24,6 @@
 #pragma GCC diagnostic ignored "-Wattributes"
 #endif
 
-#ifdef _MSC_VER
-#pragma warning(disable : 4996)   // do not complain about sprintf
-#endif
-
 #include <map>
 #include "behaviortree_cpp/xml_parsing.h"
 #include "tinyxml2/tinyxml2.h"
@@ -239,8 +236,8 @@ void XMLParser::PImpl::loadDocImpl(XMLDocument* doc, bool add_includes)
 {
   if (doc->Error())
   {
-    char buffer[200];
-    sprintf(buffer, "Error parsing the XML: %s", doc->ErrorStr());
+    char buffer[512];
+    snprintf(buffer, sizeof buffer, "Error parsing the XML: %s", doc->ErrorStr());
     throw RuntimeError(buffer);
   }
 
@@ -350,14 +347,14 @@ void VerifyXML(const std::string& xml_text,
   if (xml_error)
   {
     char buffer[512];
-    sprintf(buffer, "Error parsing the XML: %s", doc.ErrorName());
+    snprintf(buffer, sizeof buffer, "Error parsing the XML: %s", doc.ErrorName());
     throw RuntimeError(buffer);
   }
 
   //-------- Helper functions (lambdas) -----------------
   auto ThrowError = [&](int line_num, const std::string& text) {
     char buffer[512];
-    sprintf(buffer, "Error at line %d: -> %s", line_num, text.c_str());
+    snprintf(buffer, sizeof buffer, "Error at line %d: -> %s", line_num, text.c_str());
     throw RuntimeError(buffer);
   };
 

tests/test_helper.hpp

@@ -1,6 +1,8 @@
 #ifndef TEST_HELPER_HPP
 #define TEST_HELPER_HPP
 
+#include <cstdio>
+
 #include "behaviortree_cpp/bt_factory.h"
 
 inline BT::NodeStatus TestTick(int* tick_counter)
@@ -17,7 +19,7 @@ void RegisterTestTick(BT::BehaviorTreeFactory& factory, const std::string& name_
     {
         tick_counters[i] = false;
         char str[100];
-        sprintf(str, "%s%c", name_prefix.c_str(), char('A'+i ) );
+        snprintf(str, sizeof str, "%s%c", name_prefix.c_str(), char('A'+i ) );
         int* counter_ptr = &(tick_counters[i]);
         factory.registerSimpleAction(str, std::bind(&TestTick, counter_ptr));
     }