Merge pull request #1685 from ctiller/cq-fix

Fix a use after free in completion queue tracing
10 years ago · 72b0f3a99e
parent 19944f5b27 a605d334fb
commit 72b0f3a99e
1 changed files with 2 additions and 2 deletions
--- a/src/core/surface/completion_queue.c
+++ b/src/core/surface/completion_queue.c
@ -275,14 +275,14 @@ grpc_event grpc_completion_queue_pluck(grpc_completion_queue *cc, void *tag,
      gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset));
      memset(&ret, 0, sizeof(ret));
      ret.type = GRPC_QUEUE_TIMEOUT;
-      GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ev->base);
+      GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret);
      return ret;
    }
  }
  gpr_mu_unlock(GRPC_POLLSET_MU(&cc->pollset));
  ret = ev->base;
  gpr_free(ev);
-  GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ev->base);
+  GRPC_SURFACE_TRACE_RETURNED_EVENT(cc, &ret);
  return ret;
 }