Fixed bug #35612 (iis6 Access Violation crash). (alacn dot uhahaa at gmail dot com)

dstogov · dstogov · commit bb16adb51891 · 2005-12-22T16:46:32.000Z
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -1247,14 +1247,16 @@ static unsigned __stdcall timeout_thread_proc(void *pArgs)
 	}
 	DestroyWindow(timeout_window);
 	UnregisterClass(wc.lpszClassName, NULL);
+	SetEvent(timeout_thread_handle);
 	return 0;
 }
 
 
 void zend_init_timeout_thread()
 {
 	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
-	timeout_thread_handle = _beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
+	timeout_thread_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
+	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
 	WaitForSingleObject(timeout_thread_event, INFINITE);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1247,14 +1247,16 @@ static unsigned __stdcall timeout_thread_proc(void *pArgs)`
`1247`	`1247`	`}`
`1248`	`1248`	`DestroyWindow(timeout_window);`
`1249`	`1249`	`UnregisterClass(wc.lpszClassName, NULL);`
	`1250`	`+ SetEvent(timeout_thread_handle);`
`1250`	`1251`	`return 0;`
`1251`	`1252`	`}`
`1252`	`1253`
`1253`	`1254`
`1254`	`1255`	`void zend_init_timeout_thread()`
`1255`	`1256`	`{`
`1256`	`1257`	`timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);`
`1257`		`- timeout_thread_handle = _beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);`
	`1258`	`+ timeout_thread_handle = CreateEvent(NULL, FALSE, FALSE, NULL);`
	`1259`	`+ _beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);`
`1258`	`1260`	`WaitForSingleObject(timeout_thread_event, INFINITE);`
`1259`	`1261`	`}`
`1260`	`1262`