From: Matt Caswell <matt@openssl.org>
Date: Thu, 16 Jun 2016 14:59:42 +0000 (+0100)
Subject: Revert "RT4526: Call TerminateProcess, not ExitProcess"
X-Git-Tag: OpenSSL_1_1_0-pre6~420
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f219a1b0485309b6814f00985f7bbb45e72ee374;p=thirdparty%2Fopenssl.git

Revert "RT4526: Call TerminateProcess, not ExitProcess"

This reverts commit 9c1a9ccf65d0ea1912675d3a622fa8e51b524b9e.

TerminateProcess is asynchronous, so the code as written in the above
commit is not correct. It is also probably not needed in the speed
case. Reverting in order to figure out the correct solution.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/speed.c b/apps/speed.c
index f439d0d9319..3b162e1058c 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -314,7 +314,7 @@ static double Time_F(int s)
         if (thr == NULL) {
             DWORD err = GetLastError();
             BIO_printf(bio_err, "unable to CreateThread (%lu)", err);
-            TerminateProcess(GetCurrentProcess(), err);
+            ExitProcess(err);
         }
         while (!schlock)
             Sleep(0);           /* scheduler spinlock */
diff --git a/ms/uplink.c b/ms/uplink.c
index 2096f2cacf5..7f7abfbe57e 100644
--- a/ms/uplink.c
+++ b/ms/uplink.c
@@ -28,7 +28,7 @@ static TCHAR msg[128];
 static void unimplemented(void)
 {
     OPENSSL_showfatal(sizeof(TCHAR) == sizeof(char) ? "%s\n" : "%S\n", msg);
-    TerminateProcess(GetCurrentProcess(), 1);
+    ExitProcess(1);
 }
 
 void OPENSSL_Uplink(volatile void **table, int index)