mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

macOS: Fixed a data race in URLConnectionState

Browse source
This commit is contained in:
ed 2020-03-09 09:45:31 +00:00
parent 32f077a86a
commit 5cf2802a00
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/juce_core/native/juce_mac_Network.mm
View file

@ -188,15 +188,21 @@ public:
int read (char* dest, int numBytes) int read (char* dest, int numBytes)
{ {
int numDone = 0; int numDone = 0, dataLength = 0;
{
const ScopedLock sl (dataLock);
dataLength = (int) [data length];
}
while (numBytes > 0) while (numBytes > 0)
{ {
const int available = jmin (numBytes, (int) [data length]); auto available = jmin (numBytes, dataLength);
if (available > 0) if (available > 0)
{ {
const ScopedLock sl (dataLock); const ScopedLock sl (dataLock);
[data getBytes: dest length: (NSUInteger) available]; [data getBytes: dest length: (NSUInteger) available];
[data replaceBytesInRange: NSMakeRange (0, (NSUInteger) available) withBytes: nil length: 0]; [data replaceBytesInRange: NSMakeRange (0, (NSUInteger) available) withBytes: nil length: 0];
@ -743,15 +749,21 @@ public:
int read (char* dest, int numBytes) int read (char* dest, int numBytes)
{ {
int numDone = 0; int numDone = 0, dataLength = 0;
{
const ScopedLock sl (dataLock);
dataLength = (int) [data length];
}
while (numBytes > 0) while (numBytes > 0)
{ {
const int available = jmin (numBytes, (int) [data length]); auto available = jmin (numBytes, dataLength);
if (available > 0) if (available > 0)
{ {
const ScopedLock sl (dataLock); const ScopedLock sl (dataLock);
[data getBytes: dest length: (NSUInteger) available]; [data getBytes: dest length: (NSUInteger) available];
[data replaceBytesInRange: NSMakeRange (0, (NSUInteger) available) withBytes: nil length: 0]; [data replaceBytesInRange: NSMakeRange (0, (NSUInteger) available) withBytes: nil length: 0];