Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc

Issue 598223004: [NaCl SDK] nacl_io: add return value to nacl_io_init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mem_leaks
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc
diff --git a/native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc b/native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc
index 392f440e3bd5a94535c2291cd3e82181fd412a89..d0790648c6380f3c22629edaf164a66611612e3d 100644
--- a/native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc
+++ b/native_client_sdk/src/libraries/nacl_io/kernel_intercept.cc
@@ -110,8 +110,12 @@ int ki_is_initialized() {
return s_state.kp != NULL;
}
-void ki_uninit() {
+int ki_uninit() {
LOG_TRACE("ki_uninit");
+ assert(s_state.kp);
+ if (s_state.kp == NULL)
+ return 1;
+
if (s_saved_state.kp == NULL)
kernel_wrap_uninit();
@@ -125,6 +129,7 @@ void ki_uninit() {
delete state_to_delete.kp;
delete state_to_delete.ppapi;
+ return 0;
}
nacl_io::KernelProxy* ki_get_proxy() {
« no previous file with comments | « native_client_sdk/src/libraries/nacl_io/kernel_intercept.h ('k') | native_client_sdk/src/libraries/nacl_io/nacl_io.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698