From: Matt Caswell <matt@openssl.org>
Date: Thu, 16 Jun 2016 15:01:58 +0000 (+0100)
Subject: Revert "RT4526: Call TerminateProcess, not ExitProcess"
X-Git-Tag: OpenSSL_1_0_2i~139
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c144b4edda9177ab42c0fa94977098763074f912;p=oweals%2Fopenssl.git

Revert "RT4526: Call TerminateProcess, not ExitProcess"

This reverts commit 75f90688fb2dec0f897cad8be8b92be725c5016b.

TerminateProcess is asynchronous, so the code as written in the above
commit is not correct (and doesn't even compile at the moment). 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 a37c9b547d..95adcc19cc 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -332,7 +332,7 @@ static double Time_F(int s)
         if (thr == NULL) {
             DWORD ret = GetLastError();
             BIO_printf(bio_err, "unable to CreateThread (%d)", ret);
-            TerminateProcess(GetCurrentProcess(), err);
+            ExitProcess(ret);
         }
         CloseHandle(thr);       /* detach the thread */
         while (!schlock)
diff --git a/ms/uplink.c b/ms/uplink.c
index c5c9cd4f71..e58ab9d8f5 100644
--- a/ms/uplink.c
+++ b/ms/uplink.c
@@ -19,7 +19,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)