Fixed bug #35612 (iis6 Access Violation crash)

dstogov · dstogov · commit 11b71e8139e2 · 2005-12-09T18:11:03.000Z
diff --git a/NEWS b/NEWS
@@ -4,6 +4,7 @@ PHP                                                                        NEWS
 - Fixed an error in mysqli_fetch_fields (returned NULL instead of an
   array when row number > field_count). (Georg)
 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #35612 (iis6 Access Violation crash). (Dmitry, alacn.uhahaa)
 - FIxed bug #35536 (mysql_field_type() doesn't handle NEWDECIMAL). (Tony)
 - Fixed bug #35437 (Segfault or Invalid Opcode 137/1/4). (Dmitry)
 - Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
@@ -45,6 +45,7 @@ ZEND_API zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL };
 static WNDCLASS wc;
 static HWND timeout_window;
 static HANDLE timeout_thread_event;
+static HANDLE timeout_thread_handle;
 static DWORD timeout_thread_id;
 static int timeout_thread_initialized=0;
 #endif
@@ -1253,7 +1254,7 @@ static unsigned __stdcall timeout_thread_proc(void *pArgs)
 void zend_init_timeout_thread()
 {
 	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
-	_beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
+	timeout_thread_handle = _beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);
 	WaitForSingleObject(timeout_thread_event, INFINITE);
 }
 
@@ -1264,6 +1265,10 @@ void zend_shutdown_timeout_thread()
 		return;
 	}
 	PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);
+
+	/* Wait for thread termination */
+	WaitForSingleObject(timeout_thread_handle, 5000);
+	CloseHandle(timeout_thread_handle);
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ ZEND_API zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL };`
`45`	`45`	`static WNDCLASS wc;`
`46`	`46`	`static HWND timeout_window;`
`47`	`47`	`static HANDLE timeout_thread_event;`
	`48`	`+static HANDLE timeout_thread_handle;`
`48`	`49`	`static DWORD timeout_thread_id;`
`49`	`50`	`static int timeout_thread_initialized=0;`
`50`	`51`	`#endif`
`@@ -1253,7 +1254,7 @@ static unsigned __stdcall timeout_thread_proc(void *pArgs)`
`1253`	`1254`	`void zend_init_timeout_thread()`
`1254`	`1255`	`{`
`1255`	`1256`	`timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);`
`1256`		`- _beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);`
	`1257`	`+ timeout_thread_handle = _beginthreadex(NULL, 0, timeout_thread_proc, NULL, 0, &timeout_thread_id);`
`1257`	`1258`	`WaitForSingleObject(timeout_thread_event, INFINITE);`
`1258`	`1259`	`}`
`1259`	`1260`
`@@ -1264,6 +1265,10 @@ void zend_shutdown_timeout_thread()`
`1264`	`1265`	`return;`
`1265`	`1266`	`}`
`1266`	`1267`	`PostThreadMessage(timeout_thread_id, WM_QUIT, 0, 0);`
	`1268`	`+`
	`1269`	`+ /* Wait for thread termination */`
	`1270`	`+ WaitForSingleObject(timeout_thread_handle, 5000);`
	`1271`	`+ CloseHandle(timeout_thread_handle);`
`1267`	`1272`	`}`
`1268`	`1273`
`1269`	`1274`	`#endif`