aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbenchan@chromium.org <benchan@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-01-27 05:23:23 +0000
committerbenchan@chromium.org <benchan@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-01-27 05:23:23 +0000
commit403124f9e2e31b8752f7835f3c86f4e91c20ed4e (patch)
treeb4e70cca170568306fcc9e6c732b64c60228e61a
parentFix several clang warnings in breakpad. (diff)
downloadbreakpad-403124f9e2e31b8752f7835f3c86f4e91c20ed4e.tar.xz
Fix test addresses to use uintptr_t instead of u_int64_t.
When a variable is used to set (and lookup) MappingInfo's "start_addr" field, it needs to match types -- which is "uintptr_t". When Chrome OS updated the 'make' that's used for building, the 32-bit "char *" had sign-extended when cast up to a u_int64_t -- maybe because pointers were unsigned before and then changed to be signed -- and that caused the address lookup to fail. BUG=chromium-os:25355 TEST=Ran Breakpad unittests A=mkrebs@chromium.org Review URL: http://breakpad.appspot.com/345001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@908 4c0a9323-5329-0410-9bdc-e9ce6186880e
-rw-r--r--src/client/linux/handler/exception_handler_unittest.cc2
-rw-r--r--src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc2
-rw-r--r--src/client/linux/minidump_writer/minidump_writer_unittest.cc4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/client/linux/handler/exception_handler_unittest.cc b/src/client/linux/handler/exception_handler_unittest.cc
index 73e5c4c2..f8024f26 100644
--- a/src/client/linux/handler/exception_handler_unittest.cc
+++ b/src/client/linux/handler/exception_handler_unittest.cc
@@ -626,7 +626,7 @@ TEST(ExceptionHandlerTest, ModuleInfo) {
MAP_PRIVATE | MAP_ANON,
-1,
0));
- const u_int64_t kMemoryAddress = reinterpret_cast<u_int64_t>(memory);
+ const uintptr_t kMemoryAddress = reinterpret_cast<uintptr_t>(memory);
ASSERT_TRUE(memory);
string minidump_filename;
diff --git a/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc b/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
index 84e1974f..5f7995c1 100644
--- a/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
+++ b/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
@@ -144,7 +144,7 @@ TEST(LinuxPtraceDumperTest, MergedMappings) {
0));
ASSERT_TRUE(mapping);
- const u_int64_t kMappingAddress = reinterpret_cast<u_int64_t>(mapping);
+ const uintptr_t kMappingAddress = reinterpret_cast<uintptr_t>(mapping);
// Ensure that things get cleaned up.
StackHelper helper(fd, mapping, kMappingSize);
diff --git a/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/src/client/linux/minidump_writer/minidump_writer_unittest.cc
index ee021ae3..ef1e7a54 100644
--- a/src/client/linux/minidump_writer/minidump_writer_unittest.cc
+++ b/src/client/linux/minidump_writer/minidump_writer_unittest.cc
@@ -121,7 +121,7 @@ TEST(MinidumpWriterTest, MappingInfo) {
MAP_PRIVATE | MAP_ANON,
-1,
0));
- const u_int64_t kMemoryAddress = reinterpret_cast<u_int64_t>(memory);
+ const uintptr_t kMemoryAddress = reinterpret_cast<uintptr_t>(memory);
ASSERT_TRUE(memory);
const pid_t child = fork();
@@ -224,7 +224,7 @@ TEST(MinidumpWriterTest, MappingInfoContained) {
MAP_PRIVATE,
fd,
0));
- const u_int64_t kMemoryAddress = reinterpret_cast<u_int64_t>(memory);
+ const uintptr_t kMemoryAddress = reinterpret_cast<uintptr_t>(memory);
ASSERT_TRUE(memory);
close(fd);