From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Mon, 17 Dec 2012 10:47:21 +0000 (+0100)
Subject: model-checker : if frame name is empty, stop stack unwinding
X-Git-Tag: v3_9_rc1~86^2~67
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7aa52bfbfe54f5be7c01add5ee242ee4c03b7e4e?ds=sidebyside

model-checker : if frame name is empty, stop stack unwinding
---

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index f937d62b47..904d127896 100644
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -449,16 +449,14 @@ static xbt_strbuff_t get_local_variables_values(void *stack_context, void *heap)
     unw_get_reg(&c, UNW_REG_IP, &ip);
     unw_get_reg(&c, UNW_REG_SP, &sp);
 
-    unw_get_proc_name (&c, frame_name, sizeof (frame_name), &off);
-
-    xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name));
+    unw_get_proc_name(&c, frame_name, sizeof (frame_name), &off);
 
     frame = xbt_dict_get_or_null(mc_local_variables, frame_name);
 
-    if(frame == NULL){
-      ret = unw_step(&c);
-      continue;
-    }
+    if(frame == NULL)
+      return variables;
+
+    xbt_strbuff_append(variables, bprintf("ip=%s\n", frame_name));
 
     true_ip = (long)frame->low_pc + (long)off;