comments

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index b19a5d304ce4d28b5e8ad7064c7b37aa18afaf17..10a335cb3ef82e2428a802d449e9bf75d61b0268 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,3 +1,6 @@
+#include <string.h>
+#include <stdlib.h>
+
 #include "threads.h"
 #include "schedule.h"
 #include "common.h"
@@ -16,9 +19,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));
-               memcpy(new_enabled, is_enabled, 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;
        }
@@ -90,7 +95,10 @@ Thread * Scheduler::next_thread(Thread *t)
                                return NULL;
                        }
                }
+       } else {
+               curr_thread_index = id_to_int(t->get_id());
        }
+
        current = t;
        print();
        return t;