From 50c2ffd12518d1040f3bd1fee343e63af9f89d3b Mon Sep 17 00:00:00 2001 From: Vincent Brillault Date: Sat, 20 Sep 2014 18:49:57 +0200 Subject: [PATCH] Turbostat: this code can fail in fact... --- src/turbostat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/turbostat.c b/src/turbostat.c index 0cf789e0..6995df55 100644 --- a/src/turbostat.c +++ b/src/turbostat.c @@ -1194,8 +1194,9 @@ topology_probe() free(topology.cpus); memset(&topology, 0, sizeof(topology)); - /* Can't fail (update_max_cpu_id always returns 0) */ - assert(for_all_proc_cpus(update_max_cpu_id)); + ret = for_all_proc_cpus(update_max_cpu_id); + if (ret != 0) + goto err; topology.cpus = calloc(1, (topology.max_cpu_id + 1) * sizeof(struct cpu_topology)); if (topology.cpus == NULL) { @@ -1213,8 +1214,9 @@ topology_probe() if (ret != 0) goto err; - /* Can't fail (mark_cpu_present always returns 0) */ - assert(for_all_proc_cpus(mark_cpu_present)); + ret = for_all_proc_cpus(mark_cpu_present); + if (ret != 0) + goto err; /* * For online cpus -- 2.11.0