summaryrefslogtreecommitdiffstats
path: root/chrome/nacl
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 21:36:38 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-09 21:36:38 +0000
commit995fae0dd0a487ce55218c404ea0c34985a7a4f9 (patch)
treef9c9785d49830ea422352fdcb14d170ef4f0bb33 /chrome/nacl
parenta78da50e623dd2ff6573f41febd91dac43c21bc7 (diff)
downloadchromium_src-995fae0dd0a487ce55218c404ea0c34985a7a4f9.zip
chromium_src-995fae0dd0a487ce55218c404ea0c34985a7a4f9.tar.gz
chromium_src-995fae0dd0a487ce55218c404ea0c34985a7a4f9.tar.bz2
NaCl: Remove call to NaClAppDtor()
Calling NaClAppDtor() is unnecessary because the process is about to exit anyway, and it happens only in the error path because NaClAppDtor() is not able to shut down running NaCl threads safely. There is a TODO for its removal in the NaCl tree. This is related to http://codereview.chromium.org/2659002. BUG=http://code.google.com/p/nativeclient/issues/detail?id=560 TEST=nacl_ui_test Review URL: http://codereview.chromium.org/2753002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49324 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
-rw-r--r--chrome/nacl/sel_main.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/nacl/sel_main.cc b/chrome/nacl/sel_main.cc
index a7c5e8d..445f283 100644
--- a/chrome/nacl/sel_main.cc
+++ b/chrome/nacl/sel_main.cc
@@ -89,7 +89,7 @@ int SelMain(const int desc, const NaClHandle handle) {
if (!NaClAppCtor(&state)) {
fprintf(stderr, "Error while constructing app state\n");
- goto done_file_dtor;
+ goto done;
}
state.restrict_to_main_thread = main_thread_only;
@@ -192,11 +192,6 @@ int SelMain(const int desc, const NaClHandle handle) {
done:
fflush(stdout);
- NaClAppDtor(&state);
-
- done_file_dtor:
- fflush(stdout);
-
NaClAllModulesFini();
return ret_code;