Memory fixes
diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c
index 63b0683..9852034 100644
--- a/src/core/lib/surface/call.c
+++ b/src/core/lib/surface/call.c
@@ -989,12 +989,15 @@
if (n == 0) {
return GRPC_ERROR_NONE;
} else if (n == 1) {
- return bctl->errors[0];
+ grpc_error *e = bctl->errors[0];
+ bctl->errors[0] = NULL;
+ return e;
} else {
grpc_error *error =
GRPC_ERROR_CREATE_REFERENCING("Call batch failed", bctl->errors, n);
for (size_t i = 0; i < n; i++) {
GRPC_ERROR_UNREF(bctl->errors[i]);
+ bctl->errors[i] = NULL;
}
return error;
}
@@ -1221,8 +1224,8 @@
static void add_batch_error(grpc_exec_ctx *exec_ctx, batch_control *bctl,
grpc_error *error) {
if (error == GRPC_ERROR_NONE) return;
- cancel_with_error(exec_ctx, bctl->call, GRPC_ERROR_REF(error));
int idx = (int)gpr_atm_no_barrier_fetch_add(&bctl->num_errors, 1);
+ if (idx > 0) cancel_with_error(exec_ctx, bctl->call, GRPC_ERROR_REF(error));
bctl->errors[idx] = error;
}
@@ -1258,7 +1261,7 @@
receiving_stream_ready, call->saved_receiving_stream_ready_bctlp,
grpc_schedule_on_exec_ctx);
call->saved_receiving_stream_ready_bctlp = NULL;
- grpc_closure_sched(exec_ctx, saved_rsr_closure, error);
+ grpc_closure_sched(exec_ctx, saved_rsr_closure, GRPC_ERROR_REF(error));
}
gpr_mu_unlock(&call->mu);