Unset /D_CRT_SECURE_NO_WARNINGS

jkeiser · jkeiser · commit 1d06624d385c · 2020-05-04T11:35:05.000-07:00
- Also localize DISABLE_DEPRECATED_WARNING so that we catch other
  deprecations
diff --git a/include/simdjson.h b/include/simdjson.h
@@ -14,7 +14,6 @@ SIMDJSON_PUSH_DISABLE_WARNINGS
 #if defined(_MSC_VER) && defined(__clang__)
 SIMDJSON_DISABLE_GCC_WARNING(-Wmicrosoft-include)
 #endif
-SIMDJSON_DISABLE_DEPRECATED_WARNING
 
 // Public API
 #include "simdjson/simdjson_version.h"
diff --git a/include/simdjson/inline/document.h b/include/simdjson/inline/document.h
@@ -339,7 +339,11 @@ inline bool parser::dump_raw_tape(std::ostream &os) const noexcept {
 
 inline simdjson_result<size_t> parser::read_file(const std::string &path) noexcept {
   // Open the file
+  SIMDJSON_PUSH_DISABLE_WARNINGS
+  SIMDJSON_DISABLE_DEPRECATED_WARNING // Disable CRT_SECURE warning on MSVC: manually verified this is safe
   std::FILE *fp = std::fopen(path.c_str(), "rb");
+  SIMDJSON_POP_DISABLE_WARNINGS
+
   if (fp == nullptr) {
     return IO_ERROR;
   }
diff --git a/include/simdjson/inline/padded_string.h b/include/simdjson/inline/padded_string.h
@@ -102,7 +102,11 @@ inline padded_string::operator std::string_view() const { return std::string_vie
 
 inline simdjson_result<padded_string> padded_string::load(const std::string &filename) noexcept {
   // Open the file
+  SIMDJSON_PUSH_DISABLE_WARNINGS
+  SIMDJSON_DISABLE_DEPRECATED_WARNING // Disable CRT_SECURE warning on MSVC: manually verified this is safe
   std::FILE *fp = std::fopen(filename.c_str(), "rb");
+  SIMDJSON_POP_DISABLE_WARNINGS
+
   if (fp == nullptr) {
     return IO_ERROR;
   }
diff --git a/include/simdjson/inline/parsedjson_iterator.h b/include/simdjson/inline/parsedjson_iterator.h
@@ -5,6 +5,12 @@
 
 namespace simdjson {
 
+// VS2017 reports deprecated warnings when you define a deprecated class's methods.
+SIMDJSON_PUSH_DISABLE_WARNINGS
+SIMDJSON_DISABLE_DEPRECATED_WARNING
+
+// Because of template weirdness, the actual class definition is inline in the document class
+
 WARN_UNUSED bool dom::parser::Iterator::is_ok() const {
   return location < tape_length;
 }
@@ -471,6 +477,8 @@ bool dom::parser::Iterator::relative_move_to(const char *pointer,
   return found;
 }
 
+SIMDJSON_POP_DISABLE_WARNINGS
+
 } // namespace simdjson
 
 #endif // SIMDJSON_INLINE_PARSEDJSON_ITERATOR_H
diff --git a/simdjson-flags.cmake b/simdjson-flags.cmake
@@ -39,7 +39,7 @@ add_library(simdjson-internal-flags INTERFACE)
 target_link_libraries(simdjson-internal-flags INTERFACE simdjson-flags)
 
 if(MSVC)
-  target_compile_options(simdjson-internal-flags INTERFACE /nologo /D_CRT_SECURE_NO_WARNINGS)
+  target_compile_options(simdjson-internal-flags INTERFACE /nologo)
   target_compile_options(simdjson-internal-flags INTERFACE /WX /W3 /sdl)
 else()
   target_compile_options(simdjson-internal-flags INTERFACE -fPIC)
diff --git a/src/implementation.cpp b/src/implementation.cpp
@@ -122,7 +122,11 @@ const implementation *available_implementation_list::detect_best_supported() con
 }
 
 const implementation *detect_best_supported_implementation_on_first_use::set_best() const noexcept {
+  SIMDJSON_PUSH_DISABLE_WARNINGS
+  SIMDJSON_DISABLE_DEPRECATED_WARNING // Disable CRT_SECURE warning on MSVC: manually verified this is safe
   char *force_implementation_name = getenv("SIMDJSON_FORCE_IMPLEMENTATION");
+  SIMDJSON_POP_DISABLE_WARNINGS
+
   if (force_implementation_name) {
     auto force_implementation = available_implementations[force_implementation_name];
     if (!force_implementation) {
diff --git a/src/simdjson.cpp b/src/simdjson.cpp
@@ -4,7 +4,6 @@ SIMDJSON_PUSH_DISABLE_WARNINGS
 #if defined(SIMDJSON_CLANG_VISUAL_STUDIO)
 SIMDJSON_DISABLE_GCC_WARNING(-Wmicrosoft-include)
 #endif
-SIMDJSON_DISABLE_DEPRECATED_WARNING
 
 #include "error.cpp"
 #include "implementation.cpp"
diff --git a/tests/jsoncheck.cpp b/tests/jsoncheck.cpp
@@ -55,15 +55,11 @@ bool validate(const char *dirname) {
     if (has_extension(name, extension)) {
       printf("validating: file %s ", name);
       fflush(nullptr);
-      size_t filelen = strlen(name);
-      char *fullpath = static_cast<char *>(malloc(dirlen + filelen + 1 + 1));
-      strcpy(fullpath, dirname);
-      if (needsep) {
-        fullpath[dirlen] = '/';
-        strcpy(fullpath + dirlen + 1, name);
-      } else {
-        strcpy(fullpath + dirlen, name);
-      }
+      size_t namelen = strlen(name);
+      size_t fullpathlen = dirlen + 1 + namelen + 1;
+      char *fullpath = static_cast<char *>(malloc(fullpathlen));
+      snprintf(fullpath, fullpathlen, "%s%s%s", dirname, needsep ? "/" : "", name);
+
       auto [p, error] = simdjson::padded_string::load(fullpath);
       if (error) {
         std::cerr << "Could not load the file " << fullpath << std::endl;
diff --git a/tests/parse_many_test.cpp b/tests/parse_many_test.cpp
@@ -63,16 +63,10 @@ bool validate(const char *dirname) {
             /*  Finding the file path  */
             printf("validating: file %s ", name);
             fflush(nullptr);
-            size_t filelen = strlen(name);
-            char *fullpath = static_cast<char *>(malloc(dirlen + filelen + 1 + 1));
-            strcpy(fullpath, dirname);
-            if (needsep) {
-                fullpath[dirlen] = '/';
-                strcpy(fullpath + dirlen + 1, name);
-            } else {
-                strcpy(fullpath + dirlen, name);
-            }
-
+            size_t namelen = strlen(name);
+            size_t fullpathlen = dirlen + 1 + namelen + 1;
+            char *fullpath = static_cast<char *>(malloc(fullpathlen));
+            snprintf(fullpath, fullpathlen, "%s%s%s", dirname, needsep ? "/" : "", name);
 
             /* The actual test*/
             auto [json, error] = simdjson::padded_string::load(fullpath);
