aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/core/lib/profiling/basic_timers.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/profiling/basic_timers.c b/src/core/lib/profiling/basic_timers.c
index 0a4ae3057a..50082cd7ee 100644
--- a/src/core/lib/profiling/basic_timers.c
+++ b/src/core/lib/profiling/basic_timers.c
@@ -173,7 +173,7 @@ static void flush_logs(gpr_timer_log_list *list) {
gpr_timer_log *log;
while ((log = timer_log_pop_front(list)) != NULL) {
write_log(log);
- gpr_free(log);
+ free(log);
}
}
@@ -208,7 +208,8 @@ static void init_output() {
}
static void rotate_log() {
- gpr_timer_log *new = gpr_malloc(sizeof(*new));
+ /* Using malloc here, as this code could end up being called by gpr_malloc */
+ gpr_timer_log *new = malloc(sizeof(*new));
gpr_once_init(&g_once_init, init_output);
new->num_entries = 0;
pthread_mutex_lock(&g_mu);