diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 21:39:06 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-25 21:39:06 +0000 |
| commit | 0f41da5958d0b708d5344846011f71940499d139 (patch) | |
| tree | 2171f4e6a01dba3b3f9b0d6c5c504e9a2453e0e2 /chrome/nacl | |
| parent | c90810c3207fd49cc12cded763340492b25f623d (diff) | |
| download | chromium_src-0f41da5958d0b708d5344846011f71940499d139.zip chromium_src-0f41da5958d0b708d5344846011f71940499d139.tar.gz chromium_src-0f41da5958d0b708d5344846011f71940499d139.tar.bz2 | |
NaCl: Add assertion that NaClMainForChromium() does not return
NaClMainForChromium() should do an _exit() when NaCl untrusted code
does an exit syscall. I will change NaClMainForChromium() on the NaCl
side to do this.
Update the function prototype to match the NaCl-side change.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=2083
TEST=run_ppapi_crash_browser_test currently triggers this, before the
NaCl-side change, because its CHECK() call happens to do an _exit()
Review URL: http://codereview.chromium.org/7500004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/nacl_listener.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc index 9652070..b14c176 100644 --- a/chrome/nacl/nacl_listener.cc +++ b/chrome/nacl/nacl_listener.cc @@ -69,9 +69,9 @@ int CreateMemoryObject(size_t size, bool executable) { } // namespace #endif // defined(OS_MACOSX) -extern "C" int NaClMainForChromium(int handle_count, - const NaClHandle* handles, - int debug); +extern "C" void NaClMainForChromium(int handle_count, + const NaClHandle* handles, + int debug); extern "C" void NaClSetIrtFileDesc(int fd); NaClListener::NaClListener() {} @@ -132,4 +132,5 @@ void NaClListener::OnStartSelLdr( } NaClMainForChromium(static_cast<int>(handles.size()), array.get(), false /* debug */); + NOTREACHED(); } |