Merge pull request #4151 from martin-frbg/issue4101

martin-frbg · web-flow · commit bd01dc354b3d · 2023-07-20T13:21:07.000+02:00
Ensure that early calls to blas_set_num_threads will not overwrite unrelated memory
diff --git a/driver/others/blas_server.c b/driver/others/blas_server.c
@@ -973,7 +973,7 @@ void goto_set_num_threads(int num_threads) {
 
     increased_threads = 1;
 
-    for(i = blas_num_threads - 1; i < num_threads - 1; i++){
+    for(i = (blas_num_threads > 0) ? blas_num_threads - 1 : 0; i < num_threads - 1; i++){
 
       atomic_store_queue(&thread_status[i].queue, (blas_queue_t *)0);
       thread_status[i].status = THREAD_STATUS_WAKEUP;
diff --git a/driver/others/blas_server_win32.c b/driver/others/blas_server_win32.c
@@ -568,7 +568,7 @@ void goto_set_num_threads(int num_threads)
 			blas_server_avail = 1;
 		}
 
-		for(i = blas_num_threads - 1; i < num_threads - 1; i++){
+		for(i = (blas_num_threads > 0) ? blas_num_threads - 1 : 0; i < num_threads - 1; i++){
 
 			blas_threads[i] = CreateThread(NULL, 0,
 				     blas_thread_server, (void *)i,

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ void goto_set_num_threads(int num_threads)`
`568`	`568`	`blas_server_avail = 1;`
`569`	`569`	`}`
`570`	`570`
`571`		`- for(i = blas_num_threads - 1; i < num_threads - 1; i++){`
	`571`	`+ for(i = (blas_num_threads > 0) ? blas_num_threads - 1 : 0; i < num_threads - 1; i++){`
`572`	`572`
`573`	`573`	`blas_threads[i] = CreateThread(NULL, 0,`
`574`	`574`	`blas_thread_server, (void *)i,`