diff --git a/packages/react-native/Libraries/Network/RCTInspectorNetworkReporter.mm b/packages/react-native/Libraries/Network/RCTInspectorNetworkReporter.mm index baa3d1b0ae1..50eb801950d 100644 --- a/packages/react-native/Libraries/Network/RCTInspectorNetworkReporter.mm +++ b/packages/react-native/Libraries/Network/RCTInspectorNetworkReporter.mm @@ -13,6 +13,8 @@ #import #import +#include + using namespace facebook::react; #ifdef REACT_NATIVE_DEBUGGER_ENABLED @@ -72,6 +74,8 @@ Headers convertNSDictionaryToHeaders(const NSDictionary // Dictionary to buffer incremental response bodies (CDP debugging active only) static const NSMutableDictionary *responseBuffers = nil; +// Reporters can call from different threads, so every access to responseBuffers holds this +static std::mutex responseBuffersMutex; #endif @@ -135,16 +139,17 @@ + (void)reportResponseEnd:(NSString *)requestId encodedDataLength:(int)encodedDa #ifdef REACT_NATIVE_DEBUGGER_ENABLED // Debug build: Check for buffered response body and flush to NetworkReporter - if (responseBuffers != nullptr) { - NSMutableString *buffer = responseBuffers[requestId]; - if (buffer != nullptr) { - if (buffer.length > 0) { - NetworkReporter::getInstance().storeResponseBody( - requestId.UTF8String, RCTStringViewFromNSString(buffer), false); - } + NSMutableString *buffer = nil; + { + std::lock_guard lock(responseBuffersMutex); + if (responseBuffers != nullptr) { + buffer = responseBuffers[requestId]; [responseBuffers removeObjectForKey:requestId]; } } + if (buffer.length > 0) { + NetworkReporter::getInstance().storeResponseBody(requestId.UTF8String, RCTStringViewFromNSString(buffer), false); + } #endif } @@ -154,6 +159,7 @@ + (void)reportRequestFailed:(NSString *)requestId cancelled:(BOOL)cancelled #ifdef REACT_NATIVE_DEBUGGER_ENABLED // Debug build: Clear buffer for request + std::lock_guard lock(responseBuffersMutex); if (responseBuffers != nullptr) { [responseBuffers removeObjectForKey:requestId]; } @@ -196,6 +202,7 @@ + (void)maybeStoreResponseBodyIncremental:(NSString *)requestId data:(NSString * return; } + std::lock_guard lock(responseBuffersMutex); if (responseBuffers == nullptr) { responseBuffers = [NSMutableDictionary dictionary]; }