diff options
| author | jiangj@opera.com <jiangj@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 19:53:24 +0000 |
|---|---|---|
| committer | jiangj@opera.com <jiangj@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-03 19:53:24 +0000 |
| commit | f7a1e75b15a808160fce0688e9bbdc4e1a423800 (patch) | |
| tree | a51a8a7db21ba1ca53709eac36d38918cbd8ef4e /sandbox | |
| parent | 3ad607a6486254ac13e62cf6b05a25153f453e92 (diff) | |
| download | chromium_src-f7a1e75b15a808160fce0688e9bbdc4e1a423800.zip chromium_src-f7a1e75b15a808160fce0688e9bbdc4e1a423800.tar.gz chromium_src-f7a1e75b15a808160fce0688e9bbdc4e1a423800.tar.bz2 | |
Fix Mac bootstrap sandbox for 64-bit builds
Mach look_up2 message structs should be aligned by 4 bytes like
breakpad does, otherwise there will be a 192 bytes vs. 188 bytes
difference for look_up2_request_10_7 when compiling in 64-bit.
BUG=386330
Review URL: https://codereview.chromium.org/364233002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/mac/os_compatibility.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sandbox/mac/os_compatibility.cc b/sandbox/mac/os_compatibility.cc index aba04e1..6624f3a 100644 --- a/sandbox/mac/os_compatibility.cc +++ b/sandbox/mac/os_compatibility.cc @@ -13,6 +13,7 @@ namespace sandbox { namespace { +#pragma pack(push, 4) // Verified from launchd-329.3.3 (10.6.8). struct look_up2_request_10_6 { mach_msg_header_t Head; @@ -56,6 +57,7 @@ struct swap_integer_request_10_6 { vproc_gsk_t outkey; int64_t inval; }; +#pragma pack(pop) // TODO(rsesek): Libc provides strnlen() starting in 10.7. size_t strnlen(const char* str, size_t maxlen) { |