1313#import < React/RCTUtils.h>
1414#import < react/networking/NetworkReporter.h>
1515
16+ #include < mutex>
17+
1618using namespace facebook ::react;
1719
1820#ifdef REACT_NATIVE_DEBUGGER_ENABLED
@@ -72,6 +74,8 @@ Headers convertNSDictionaryToHeaders(const NSDictionary<NSString *, NSString *>
7274
7375// Dictionary to buffer incremental response bodies (CDP debugging active only)
7476static const NSMutableDictionary <NSString *, NSMutableString *> *responseBuffers = nil ;
77+ // Reporters can call from different threads, so every access to responseBuffers holds this
78+ static std::mutex responseBuffersMutex;
7579
7680#endif
7781
@@ -135,16 +139,17 @@ + (void)reportResponseEnd:(NSString *)requestId encodedDataLength:(int)encodedDa
135139
136140#ifdef REACT_NATIVE_DEBUGGER_ENABLED
137141 // Debug build: Check for buffered response body and flush to NetworkReporter
138- if (responseBuffers != nullptr ) {
139- NSMutableString *buffer = responseBuffers[requestId];
140- if (buffer != nullptr ) {
141- if (buffer.length > 0 ) {
142- NetworkReporter::getInstance ().storeResponseBody (
143- requestId.UTF8String , RCTStringViewFromNSString (buffer), false );
144- }
142+ NSMutableString *buffer = nil ;
143+ {
144+ std::lock_guard<std::mutex> lock (responseBuffersMutex);
145+ if (responseBuffers != nullptr ) {
146+ buffer = responseBuffers[requestId];
145147 [responseBuffers removeObjectForKey: requestId];
146148 }
147149 }
150+ if (buffer.length > 0 ) {
151+ NetworkReporter::getInstance ().storeResponseBody (requestId.UTF8String , RCTStringViewFromNSString (buffer), false );
152+ }
148153#endif
149154}
150155
@@ -154,6 +159,7 @@ + (void)reportRequestFailed:(NSString *)requestId cancelled:(BOOL)cancelled
154159
155160#ifdef REACT_NATIVE_DEBUGGER_ENABLED
156161 // Debug build: Clear buffer for request
162+ std::lock_guard<std::mutex> lock (responseBuffersMutex);
157163 if (responseBuffers != nullptr ) {
158164 [responseBuffers removeObjectForKey: requestId];
159165 }
@@ -196,6 +202,7 @@ + (void)maybeStoreResponseBodyIncremental:(NSString *)requestId data:(NSString *
196202 return ;
197203 }
198204
205+ std::lock_guard<std::mutex> lock (responseBuffersMutex);
199206 if (responseBuffers == nullptr ) {
200207 responseBuffers = [NSMutableDictionary dictionary ];
201208 }
0 commit comments