diff options
| author | doshimun <doshimun@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2008-05-08 18:15:07 +0000 |
|---|---|---|
| committer | doshimun <doshimun@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2008-05-08 18:15:07 +0000 |
| commit | 7ab126ecdd5237ccd566f415cc560b39f87e8a0f (patch) | |
| tree | e5663db8f6e6e5537ccea20e0bbd7c7afd35979d /src/client/windows/crash_generation | |
| parent | Some style guide compliance changes and changed the prototype of the method t... (diff) | |
| download | breakpad-7ab126ecdd5237ccd566f415cc560b39f87e8a0f.tar.xz | |
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
Diffstat (limited to 'src/client/windows/crash_generation')
| -rw-r--r-- | src/client/windows/crash_generation/client_info.cc | 7 | ||||
| -rw-r--r-- | src/client/windows/crash_generation/client_info.h | 2 | ||||
| -rw-r--r-- | src/client/windows/crash_generation/crash_generation.vcproj | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/client/windows/crash_generation/client_info.cc b/src/client/windows/crash_generation/client_info.cc index 0da031c9..6d602744 100644 --- a/src/client/windows/crash_generation/client_info.cc +++ b/src/client/windows/crash_generation/client_info.cc @@ -169,8 +169,11 @@ bool ClientInfo::PopulateCustomInfo() { return bytes_count == read_count; } -const CustomClientInfo& ClientInfo::GetCustomInfo() const { - return custom_client_info_; +CustomClientInfo ClientInfo::GetCustomInfo() const { + CustomClientInfo custom_info; + custom_info.entries = custom_info_entries_.get(); + custom_info.count = custom_client_info_.count; + return custom_info; } } // namespace google_breakpad diff --git a/src/client/windows/crash_generation/client_info.h b/src/client/windows/crash_generation/client_info.h index f203b83d..a134d1bb 100644 --- a/src/client/windows/crash_generation/client_info.h +++ b/src/client/windows/crash_generation/client_info.h @@ -93,7 +93,7 @@ class ClientInfo { bool PopulateCustomInfo(); // Returns the client custom information. - const CustomClientInfo& GetCustomInfo() const; + CustomClientInfo GetCustomInfo() const; private: // Crash generation server. diff --git a/src/client/windows/crash_generation/crash_generation.vcproj b/src/client/windows/crash_generation/crash_generation.vcproj index 055ced6e..b9979b26 100644 --- a/src/client/windows/crash_generation/crash_generation.vcproj +++ b/src/client/windows/crash_generation/crash_generation.vcproj @@ -326,6 +326,10 @@ RelativePath=".\minidump_generator.h" > </File> + <File + RelativePath="..\..\..\common\windows\string_utils-inl.h" + > + </File> </Filter> <Filter Name="Resource Files" |