Replace the user of wcscpy_s with safe_wcscpy in common/windows/string_utils-inl.h to

make the code compatible for teams that still use VS 2003 to build.

Fix a bug in client ClientInfo class that returned CustomClientInfo struct containing
a pointer in the client process address space instead of pointer to in-process data
structure.



git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@271 4c0a9323-5329-0410-9bdc-e9ce6186880e

1 files changed, 4 insertions, 2 deletions

diff --git a/src/client/windows/common/ipc_protocol.h b/src/client/windows/common/ipc_protocol.h
index e0a27a88..cba8699c 100644
--- a/src/client/windows/common/ipc_protocol.h
+++ b/src/client/windows/common/ipc_protocol.h
@@ -34,6 +34,7 @@
 #include <DbgHelp.h>
 #include <string>
 #include <utility>
+#include "common/windows/string_utils-inl.h"
 #include "google_breakpad/common/minidump_format.h"
 
 namespace google_breakpad {
@@ -60,7 +61,7 @@ struct CustomInfoEntry {
       name[0] = L'\0';
       return;
     }
-    wcscpy_s(name, kNameMaxLength, name_arg);
+    WindowsStringUtils::safe_wcscpy(name, kNameMaxLength, name_arg);
   }
 
   void set_value(const wchar_t* value_arg) {
@@ -68,7 +69,8 @@ struct CustomInfoEntry {
       value[0] = L'\0';
       return;
     }
-    wcscpy_s(value, kValueMaxLength, value_arg);
+
+    WindowsStringUtils::safe_wcscpy(value, kValueMaxLength, value_arg);
   }
 
   void set(const wchar_t* name_arg, const wchar_t* value_arg) {