- Fixed a race condition that happened when LZMA compression finished and occasionally deadlocked the next call (solid installers weren't affected, just the compiler)

- Added try and catch for LZMA just in case one of the rare exceptions will be thrown (just compiler)


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3233 212acab6-be3b-0410-9dea-997c60f758d6

Source/7zip/lzmaNSIS.cpp

@@ -140,15 +140,14 @@ int __stdcall lzmaDecompress(CLZMAStateP lzmaState)
   EnterCriticalSection(&lzmaState->cs);
   lzmaState->it_locked = TRUE;
 
-  while (lzmaState->dt_locked)
-  {
   if (lzmaState->finished)
   {
     LeaveCriticalSection(&lzmaState->cs);
     return lzmaState->res;
   }
+  
+  while (lzmaState->dt_locked)
     Sleep(0);
-  }
 
   return 0;
 }

Source/clzma.h

@@ -31,7 +31,6 @@ private:
   BOOL finish;
 
   CRITICAL_SECTION cs;
-  BOOL cs_initialized;
   BOOL nt_locked; /* nsis thread locked */
   BOOL ct_locked; /* compression thread locked */
   BOOL compressor_finished;
@@ -43,20 +42,17 @@ public:
   {
     _encoder = new NCompress::NLZMA::CEncoder();
     _encoder->SetWriteEndMarkerMode(true);
-    cs_initialized = FALSE;
     hCompressionThread = NULL;
     compressor_finished = FALSE;
     finish = FALSE;
     End();
+    InitializeCriticalSection(&cs);
   }
 
   ~CLZMA()
   {
     End();
-    if (cs_initialized)
-    {
     DeleteCriticalSection(&cs);
-    }
     if (_encoder)
     {
       delete _encoder;
@@ -68,12 +64,6 @@ public:
   {
     End();
 
-    if (!cs_initialized)
-    {
-      InitializeCriticalSection(&cs);
-      cs_initialized = TRUE;
-    }
-
     nt_locked = TRUE;
     ct_locked = FALSE;
 
@@ -130,6 +120,8 @@ public:
     while (nt_locked)
       Sleep(0);
 
+    try
+    {
       if (_encoder->WriteCoderProperties(this) == S_OK)
       {
         while (true)
@@ -152,6 +144,11 @@ public:
       {
         res = -2;
       }
+    }
+    catch (...)
+    {
+      res = -3;
+    }
 
     compressor_finished = TRUE;
     LeaveCriticalSection(&cs);
@@ -185,15 +182,14 @@ public:
     EnterCriticalSection(&cs);
     nt_locked = TRUE;
 
-    while (ct_locked)
-    {
     if (compressor_finished)
     {
       LeaveCriticalSection(&cs);
       return res;
     }
+
+    while (ct_locked)
       Sleep(0);
-    }
 
     return C_OK;
   }