COMPMID-417: Fix thread allocation in CPPScheduler

Change-Id: I04848b834f56ba5371a685d00f9bdd0f38addb6e
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87029
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
diff --git a/src/runtime/CPP/CPPScheduler.cpp b/src/runtime/CPP/CPPScheduler.cpp
index 9cc3f03..a8382b4 100644
--- a/src/runtime/CPP/CPPScheduler.cpp
+++ b/src/runtime/CPP/CPPScheduler.cpp
@@ -165,7 +165,7 @@
 
 CPPScheduler::CPPScheduler()
     : _num_threads(std::thread::hardware_concurrency()),
-      _threads(std::unique_ptr<Thread[], void(*)(Thread *)>(new Thread[std::thread::hardware_concurrency() - 1], delete_threads))
+      _threads(std::unique_ptr<Thread[], void(*)(Thread *)>(new Thread[_num_threads - 1], delete_threads))
 {
 }
 
@@ -173,6 +173,7 @@
 {
     const unsigned int num_cores = std::thread::hardware_concurrency();
     _num_threads                 = num_threads == 0 ? num_cores : num_threads;
+    _threads.reset(new Thread[_num_threads - 1]);
 }
 
 unsigned int CPPScheduler::num_threads() const