2 files changed, 5 insertions, 4 deletions
diff --git a/src/client/windows/crash_generation/client_info.cc b/src/client/windows/crash_generation/client_info.cc
index 48886d2a..0da031c9 100644
--- a/src/client/windows/crash_generation/client_info.cc
+++ b/src/client/windows/crash_generation/client_info.cc
@@ -169,9 +169,8 @@ bool ClientInfo::PopulateCustomInfo() {
   return bytes_count == read_count;
 }
 
-int ClientInfo::GetCustomInfo(CustomInfoEntry const** custom_info) const {
-  *custom_info = custom_info_entries_.get();
-  return custom_client_info_.count;
+const CustomClientInfo& ClientInfo::GetCustomInfo() const {
+  return custom_client_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 db3f05e9..f203b83d 100644
--- a/src/client/windows/crash_generation/client_info.h
+++ b/src/client/windows/crash_generation/client_info.h
@@ -88,10 +88,12 @@ class ClientInfo {
   bool Initialize();
   bool GetClientExceptionInfo(EXCEPTION_POINTERS** ex_info) const;
   bool GetClientThreadId(DWORD* thread_id) const;
+
   // Reads the custom information from the client process address space.
   bool PopulateCustomInfo();
+
   // Returns the client custom information.
-  int GetCustomInfo(CustomInfoEntry const** custom_info) const;
+  const CustomClientInfo& GetCustomInfo() const;
 
  private:
   // Crash generation server.