Merge pull request #1832 from chipitsine/master

src/Cedar/Server.c: fix race condition
This commit is contained in:
Ilya Shipitsin authored and GitHub committed 2023-05-13 20:42:38 +02:00
commit 2fdd9ec4dc
1 file changed
+15 -6
+15 -6
View File
@@ -1092,10 +1092,15 @@ UINT GetServerCapsInt(SERVER *s, char *name)
return 0;
}
Zero(&t, sizeof(t));
GetServerCaps(s, &t);
ret = GetCapsInt(&t, name);
Lock(s->CapsCacheLock);
{
Zero(&t, sizeof(t));
GetServerCaps(s, &t);
ret = GetCapsInt(&t, name);
}
Unlock(s->CapsCacheLock);
return ret;
}
@@ -1164,10 +1169,14 @@ void FlushServerCaps(SERVER *s)
return;
}
DestroyServerCapsCache(s);
Lock(s->CapsCacheLock);
{
DestroyServerCapsCache(s);
Zero(&t, sizeof(t));
GetServerCaps(s, &t);
Zero(&t, sizeof(t));
GetServerCaps(s, &t);
}
Unlock(s->CapsCacheLock);
}
// Get the Caps list for this server