3 files changed, 4 insertions, 6 deletions
diff --git a/src/client/windows/build/common.gypi b/src/client/windows/build/common.gypi
index 2860224a..23122f72 100644
--- a/src/client/windows/build/common.gypi
+++ b/src/client/windows/build/common.gypi
@@ -511,7 +511,6 @@
               '_CRT_SECURE_NO_DEPRECATE',
               '_CRT_NONSTDC_NO_WARNINGS',
               '_CRT_NONSTDC_NO_DEPRECATE',
-              '_SCL_SECURE_NO_DEPRECATE',
             ],
             'msvs_disabled_warnings': [4800],
             'msvs_settings': {
diff --git a/src/client/windows/build/external_code.gypi b/src/client/windows/build/external_code.gypi
index 6f968189..906cfe03 100644
--- a/src/client/windows/build/external_code.gypi
+++ b/src/client/windows/build/external_code.gypi
@@ -43,7 +43,6 @@
           '_CRT_SECURE_NO_DEPRECATE',
           '_CRT_NONSTDC_NO_WARNINGS',
           '_CRT_NONSTDC_NO_DEPRECATE',
-          '_SCL_SECURE_NO_DEPRECATE',
         ],
         'msvs_disabled_warnings': [4800],
         'msvs_settings': {
diff --git a/src/client/windows/crash_generation/minidump_generator.cc b/src/client/windows/crash_generation/minidump_generator.cc
index fe4937aa..96d7e81b 100644
--- a/src/client/windows/crash_generation/minidump_generator.cc
+++ b/src/client/windows/crash_generation/minidump_generator.cc
@@ -33,6 +33,7 @@
 #include <avrfsdk.h>
 
 #include <algorithm>
+#include <iterator>
 #include <list>
 #include <vector>
 
@@ -41,9 +42,6 @@
 
 using std::wstring;
 
-// Disable C4996: 'std::copy': Function call with parameters that may be unsafe.
-#pragma warning( disable : 4996 )
-
 namespace {
 
 // A helper class used to collect handle operations data. Unlike
@@ -177,7 +175,9 @@ bool HandleTraceData::CollectHandleData(
   stream_data->Reserved = 0;
   std::copy(operations_.begin(),
             operations_.end(),
-            reinterpret_cast<AVRF_HANDLE_OPERATION*>(stream_data + 1));
+            stdext::checked_array_iterator<AVRF_HANDLE_OPERATION*>(
+                reinterpret_cast<AVRF_HANDLE_OPERATION*>(stream_data + 1),
+                operations_.size()));
 
   return true;
 }