more bugs

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index c30b0f38874c83425dd6a15a395fa5e7fadfc025..8883d2a9b82cccc78a47b62a14d05e0e64ee52a5 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -16,9 +16,11 @@ void Scheduler::set_enabled(Thread *t, bool enabled_status) {
        int threadid=id_to_int(t->get_id());
        if (threadid>=enabled_len) {
                bool * new_enabled=(bool *)malloc(sizeof(bool)*(threadid+1));
        int threadid=id_to_int(t->get_id());
        if (threadid>=enabled_len) {
                bool * new_enabled=(bool *)malloc(sizeof(bool)*(threadid+1));

-               memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));

                memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(bool));
                memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(bool));

-               free(is_enabled);
+               if (is_enabled != NULL) {
+                       memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));
+                       free(is_enabled);
+               }

                is_enabled=new_enabled;
                enabled_len=threadid+1;
        }
                is_enabled=new_enabled;
                enabled_len=threadid+1;
        }