| Index: src/native_client/src/trusted/service_runtime/sel_ldr.c | 
| diff --git a/src/native_client/src/trusted/service_runtime/sel_ldr.c b/src/native_client/src/trusted/service_runtime/sel_ldr.c | 
| index c66ead772b4fbd0e125a85ed307c88d33fed7dba..f53d2ba8c0642c1ec7339e4c68ed5502d0d56bc5 100644 | 
| --- a/src/native_client/src/trusted/service_runtime/sel_ldr.c | 
| +++ b/src/native_client/src/trusted/service_runtime/sel_ldr.c | 
| @@ -1001,14 +1001,12 @@ void NaClSecureCommandChannel(struct NaClApp  *nap) { | 
| /* | 
| * this block until the plugin connects | 
| */ | 
| -  status = ((*nap->service_port->vtbl->AcceptConn) | 
| -            (nap->service_port, | 
| -             (struct NaClDescEffector *) &nnxep)); | 
| -  if (status < 0) { | 
| +  status = (*nap->service_port->vtbl->AcceptConn) | 
| +            (nap->service_port, &nap->secure_channel); | 
| +  if (status != 0) { | 
| NaClLog(LOG_FATAL, | 
| "NaClSecureCommandChannel: unable to establish channel\n"); | 
| } | 
| -  nap->secure_channel = NaClNrdXferEffectorTakeDesc(&nnxep); | 
|  | 
| (*nnxep.base.vtbl->Dtor)((struct NaClDescEffector *) &nnxep); | 
| /* | 
|  |