04/04: [KERNEL32] Ensure the PebLock is always released in FlsFree

[Mark Jansen]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12654d28522a70618de162...

commit 12654d28522a70618de162912f6a97c3e59c0ff1
Author:     Mark Jansen [e-mail]
AuthorDate: Fri May 11 22:23:52 2018 +0200
Commit:     Mark Jansen [e-mail]
CommitDate: Sat Sep 15 17:56:03 2018 +0200

[KERNEL32] Ensure the PebLock is always released in FlsFree
---
 dll/win32/kernel32/client/fiber.c | 56 ++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/dll/win32/kernel32/client/fiber.c b/dll/win32/kernel32/client/fiber.c
index 47d2616e66..1b1e1e37ac 100644
--- a/dll/win32/kernel32/client/fiber.c
+++ b/dll/win32/kernel32/client/fiber.c
@@ -1,12 +1,12 @@
 /*
- * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS System Libraries
- * FILE:        dll/win32/kernel32/client/fiber.c
+ * LICENSE:     GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
  * PURPOSE:     Fiber Implementation
- * PROGRAMMERS:
- *              Alex Ionescu ([e-mail])
- *              KJK::Hyperion [e-mail]
+ * COPYRIGHT:   Copyright 2005-2011 Alex Ionescu ([e-mail])
+ *              Copyright 2003-2008 KJK::Hyperion ([e-mail])
+ *              Copyright 2018 Mark Jansen ([e-mail])
  */
+
 #include <k32.h>
 #include <ndk/rtltypes.h>

@@ -410,36 +410,44 @@ FlsFree(DWORD dwFlsIndex)

RtlAcquirePebLock();

-    ret = RtlAreBitsSet(Peb->FlsBitmap, dwFlsIndex, 1);
-    if (ret)
+    _SEH2_TRY
     {
-        PLIST_ENTRY Entry;
-        PFLS_CALLBACK_FUNCTION lpCallback;
-
-        RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1);
-        lpCallback = Peb->FlsCallback[dwFlsIndex];
-        Peb->FlsCallback[dwFlsIndex] = NULL;
-
-        for (Entry = Peb->FlsListHead.Flink; Entry != &Peb->FlsListHead; Entry = Entry->Flink)
+        ret = RtlAreBitsSet(Peb->FlsBitmap, dwFlsIndex, 1);
+        if (ret)
         {
-            PRTL_FLS_DATA pFlsData;
+            PLIST_ENTRY Entry;
+            PFLS_CALLBACK_FUNCTION lpCallback;
+
+            RtlClearBits(Peb->FlsBitmap, dwFlsIndex, 1);
+            lpCallback = Peb->FlsCallback[dwFlsIndex];

-            pFlsData = CONTAINING_RECORD(Entry, RTL_FLS_DATA, ListEntry);
-            if (pFlsData->Data[dwFlsIndex])
+            for (Entry = Peb->FlsListHead.Flink; Entry != &Peb->FlsListHead; Entry = Entry->Flink)
             {
-                if (lpCallback)
+                PRTL_FLS_DATA pFlsData;
+
+                pFlsData = CONTAINING_RECORD(Entry, RTL_FLS_DATA, ListEntry);
+                if (pFlsData->Data[dwFlsIndex])
                 {
-                    lpCallback(pFlsData->Data[dwFlsIndex]);
+                    if (lpCallback)
+                    {
+                        lpCallback(pFlsData->Data[dwFlsIndex]);
+                    }
+                    pFlsData->Data[dwFlsIndex] = NULL;
                 }
-                pFlsData->Data[dwFlsIndex] = NULL;
             }
+            Peb->FlsCallback[dwFlsIndex] = NULL;
+        }
+        else
+        {
+            SetLastError(ERROR_INVALID_PARAMETER);
         }
     }
-    else
+    _SEH2_FINALLY
     {
-        SetLastError(ERROR_INVALID_PARAMETER);
+        RtlReleasePebLock();
     }
-    RtlReleasePebLock();
+    _SEH2_END;
+
     return ret;
 }