diff options
author | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 23:22:59 +0000 |
---|---|---|
committer | markus@chromium.org <markus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-14 23:22:59 +0000 |
commit | 87db39ecd5214e4edf31f2ac3370a2cd138af5d2 (patch) | |
tree | 8f8b8a7981fd46d7c4e2fbc43af93a966f1466bd /sandbox | |
parent | 00b7ac58414c599e49e1a92fb20e45af0d779d71 (diff) | |
download | chromium_src-87db39ecd5214e4edf31f2ac3370a2cd138af5d2.zip chromium_src-87db39ecd5214e4edf31f2ac3370a2cd138af5d2.tar.gz chromium_src-87db39ecd5214e4edf31f2ac3370a2cd138af5d2.tar.bz2 |
Fix minor compilation issues that can trigger on some platforms (e.g. CentOS)
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/204012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
-rw-r--r-- | sandbox/linux/seccomp/sandbox.cc | 2 | ||||
-rw-r--r-- | sandbox/linux/seccomp/trusted_thread.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sandbox/linux/seccomp/sandbox.cc b/sandbox/linux/seccomp/sandbox.cc index d6497a1..ddbed3b 100644 --- a/sandbox/linux/seccomp/sandbox.cc +++ b/sandbox/linux/seccomp/sandbox.cc @@ -336,7 +336,7 @@ void (*Sandbox::segv())(int signo) { void Sandbox::snapshotMemoryMappings(int processFd) { SysCalls sys; int mapsFd = sys.open("/proc/self/maps", O_RDONLY, 0); - if (mapsFd < 0 || !sendFd(processFd, mapsFd, -1, NULL, NULL)) { + if (mapsFd < 0 || !sendFd(processFd, mapsFd, -1, NULL, 0)) { failure: die("Cannot access /proc/self/maps"); } diff --git a/sandbox/linux/seccomp/trusted_thread.cc b/sandbox/linux/seccomp/trusted_thread.cc index 985d053..25797cc 100644 --- a/sandbox/linux/seccomp/trusted_thread.cc +++ b/sandbox/linux/seccomp/trusted_thread.cc @@ -590,7 +590,7 @@ void Sandbox::createTrustedThread(int processFdPub, int cloneFdPub, #elif defined(__i386__) struct user_desc u; u.entry_number = (typeof u.entry_number)-1; - u.base_addr = NULL; + u.base_addr = 0; u.limit = 0xfffff; u.seg_32bit = 1; u.contents = 0; |