MDEV-361 - Fix handle leak in os_thread_create (Windows)

49cadc91 · Vladislav Vaintroub · 166d4c1f · 49cadc91 · 49cadc91
Commit 49cadc91 authored Jun 21, 2012 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

storage/innobase/os/os0thread.c storage/innobase/os/os0thread.c +4 -2

storage/xtradb/os/os0thread.c storage/xtradb/os/os0thread.c +4 -2

No files found.
--- a/storage/innobase/os/os0thread.c
+++ b/storage/innobase/os/os0thread.c
@@ -136,8 +136,10 @@ os_thread_create(
 	if (thread_id) {
 		*thread_id = win_thread_id;
 	}
-
-	return(thread);
+	if (thread) {
+		CloseHandle(thread);
+	}
+	return((os_thread_t)win_thread_id);
 #else
 	int		ret;
 	os_thread_t	pthread;

--- a/storage/xtradb/os/os0thread.c
+++ b/storage/xtradb/os/os0thread.c
@@ -136,8 +136,10 @@ os_thread_create(
 	if (thread_id) {
 		*thread_id = win_thread_id;
 	}
-
-	return(thread);
+	if (thread) {
+		CloseHandle(thread);
+	}
+	return((os_thread_t)win_thread_id);
 #else
 	int		ret;
 	os_thread_t	pthread;