model: enforce rule: current_action != NULL

[model-checker.git] / snapshot-interface.cc

diff --git a/snapshot-interface.cc b/snapshot-interface.cc
index 84749f1f4b0d3a3fa2cca047dee826696eba84c9..d93e5c20dce3203378c2ea9d4f611bb90580686d 100644 (file)
--- a/snapshot-interface.cc
+++ b/snapshot-interface.cc
@@ -57,14 +57,12 @@ static void SnapshotGlobalSegments(){
                if (buf[0]=='\n')
                        break;
 
-               sscanf(buf, "%22s %p-%p [%5dK] %c%c%c/%c%c%c SM=%3s %200s\n", &type, &begin, &end, &size, &r, &w, &x, &mr, &mw, &mx, smstr, regionname);
+               sscanf(buf, "%22s %p-%p [%5dK] %c%c%c/%c%c%c SM=%3s %200s\n", type, &begin, &end, &size, &r, &w, &x, &mr, &mw, &mx, smstr, regionname);
 
                if (w == 'w' && (strstr(regionname, MYBINARYNAME) || strstr(regionname, MYLIBRARYNAME))) {
                        size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
                        if (len != 0)
                                addMemoryRegionToSnapShot(begin, len);
-                       DEBUG("%s\n", buf);
-                       DEBUG("%45s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
                }
        }
        pclose(map);
@@ -95,7 +93,7 @@ static void SnapshotGlobalSegments(){
                        size_t len = ((uintptr_t)end - (uintptr_t)begin) / PAGESIZE;
                        if (len != 0)
                                addMemoryRegionToSnapShot(begin, len);
-                       DEBUG("%45s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
+                       DEBUG("%55s: %18p - %18p\t%c%c%c%c\n", regionname, begin, end, r, w, x, p);
                }
        }
        fclose(map);
@@ -125,8 +123,8 @@ int SnapshotStack::backTrackBeforeStep(int seqindex) {
                        return stack->index;
                }
                struct stackEntry *tmp=stack;
-               MYFREE(tmp);
                stack=stack->next;
+               MYFREE(tmp);
        }
 }