diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-04-06 10:05:12 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-04-06 10:05:12 -0700 |
| commit | 137dd895343e058ba7749adcd53db900f03644d4 (patch) | |
| tree | 0dd6eb0eb920e55e9541a740fc9af80d8cc79560 /src/core/lib/iomgr/ev_poll_posix.c | |
| parent | 084c51e888629257f8103c33af0d1d75ecdf10d0 (diff) | |
| parent | a956d99978c46027663da22ff758506e83f1b7f5 (diff) | |
Merge branch 'master' into bm_cq_multi_threads
Diffstat (limited to 'src/core/lib/iomgr/ev_poll_posix.c')
| -rw-r--r-- | src/core/lib/iomgr/ev_poll_posix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/ev_poll_posix.c b/src/core/lib/iomgr/ev_poll_posix.c index d90f223362..9834cdd197 100644 --- a/src/core/lib/iomgr/ev_poll_posix.c +++ b/src/core/lib/iomgr/ev_poll_posix.c @@ -871,7 +871,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, grpc_pollset_worker **worker_hdl, gpr_timespec now, gpr_timespec deadline) { grpc_pollset_worker worker; - *worker_hdl = &worker; + if (worker_hdl) *worker_hdl = &worker; grpc_error *error = GRPC_ERROR_NONE; /* Avoid malloc for small number of elements. */ @@ -1092,7 +1092,7 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, gpr_mu_lock(&pollset->mu); } } - *worker_hdl = NULL; + if (worker_hdl) *worker_hdl = NULL; GPR_TIMER_END("pollset_work", 0); GRPC_LOG_IF_ERROR("pollset_work", GRPC_ERROR_REF(error)); return error; |