msvcrt: Fix C locale lc_time_curr refconting.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Fix C locale lc_time_curr refconting.
6e70b04c · Piotr Caban · Alexandre Julliard · e76c522a · 6e70b04c
Commit 6e70b04c authored Nov 25, 2020 by Piotr Caban Committed by Alexandre Julliard Nov 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

locale.c dlls/msvcrt/locale.c +4 -4

No files found.
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -1099,8 +1099,8 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo)
        MSVCRT_free((void*)locinfo->pcumap);
    }

-    if(locinfo->lc_time_curr && locinfo->lc_time_curr != &cloc_time_data
-            && !InterlockedDecrement(&locinfo->lc_time_curr->refcount))
+    if(locinfo->lc_time_curr && !InterlockedDecrement(&locinfo->lc_time_curr->refcount)
+            && locinfo->lc_time_curr != &cloc_time_data)
        MSVCRT_free(locinfo->lc_time_curr);

    if(InterlockedDecrement(&locinfo->refcount))
@@ -1932,8 +1932,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
                lcid[MSVCRT_LC_TIME], cp[MSVCRT_LC_TIME])) {
        copy_threadlocinfo_category(locinfo, old_locinfo, MSVCRT_LC_TIME);
        locinfo->lc_time_curr = old_locinfo->lc_time_curr;
-        if(locinfo->lc_time_curr != &cloc_time_data)
-            InterlockedIncrement(&locinfo->lc_time_curr->refcount);
+        InterlockedIncrement(&locinfo->lc_time_curr->refcount);
    } else if(lcid[MSVCRT_LC_TIME]) {
        if(!update_threadlocinfo_category(lcid[MSVCRT_LC_TIME],
                    cp[MSVCRT_LC_TIME], locinfo, MSVCRT_LC_TIME)) {
@@ -1952,6 +1951,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category,
            return NULL;
        }
        locinfo->lc_time_curr = &cloc_time_data;
+        InterlockedIncrement(&locinfo->lc_time_curr->refcount);
    }

    return locinfo;