src/native_client/src/trusted/service_runtime/nacl_syscall_common.c - Issue 3076010: IMC: Remove ReturnCreatedDesc() method from effector object

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/native_client/src/trusted/service_runtime/nacl_syscall_common.c

Issue 3076010: IMC: Remove ReturnCreatedDesc() method from effector object (Closed)

Patch Set: Created 10 years, 5 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

« src/native_client/src/trusted/desc/nrd_xfer_effector.c ('K') | « src/native_client/src/trusted/service_runtime/nacl_desc_effector_ldr.c ('k') | src/native_client/src/trusted/service_runtime/nacl_text.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/native_client/src/trusted/service_runtime/nacl_syscall_common.c

diff --git a/src/native_client/src/trusted/service_runtime/nacl_syscall_common.c b/src/native_client/src/trusted/service_runtime/nacl_syscall_common.c

index f2af1bf750670ce2ddb858c5788d69c02718efe2..d8a9075f7a29ecb0d1a406cd1f82246bc35aa91c 100644

--- a/src/native_client/src/trusted/service_runtime/nacl_syscall_common.c

+++ b/src/native_client/src/trusted/service_runtime/nacl_syscall_common.c

@@ -1525,7 +1525,11 @@ int32_t NaClCommonSysImc_Accept(struct NaClAppThread *natp,

if (NULL == ndp) {

retval = -NACL_ABI_EBADF;

} else {

- retval = (*ndp->vtbl->AcceptConn)(ndp, natp->effp);

+ struct NaClDesc *result_desc;

+ retval = (*ndp->vtbl->AcceptConn)(ndp, &result_desc);

+ if (retval == 0) {

+ retval = NaClSetAvail(natp->nap, result_desc);

+ }

NaClDescUnref(ndp);

}

@@ -1547,7 +1551,11 @@ int32_t NaClCommonSysImc_Connect(struct NaClAppThread *natp,

if (NULL == ndp) {

retval = -NACL_ABI_EBADF;

} else {

- retval = (*ndp->vtbl->ConnectAddr)(ndp, natp->effp);

+ struct NaClDesc *result;

+ retval = (*ndp->vtbl->ConnectAddr)(ndp, &result);

+ if (retval == 0) {

+ retval = NaClSetAvail(natp->nap, result);

+ }

NaClDescUnref(ndp);

}