From 05f84ab5b527cb3bbf8de100d32b18ff9729d7d1 Mon Sep 17 00:00:00 2001
From: Saad Najmi <sanajmi@microsoft.com>
Date: Wed, 26 Feb 2025 13:13:51 -0800
Subject: [PATCH 1/2] fix: avoid race condition crash in [RCTDataRequestHandler
 invalidate]

---
 .../Libraries/Network/RCTDataRequestHandler.mm      | 11 ++++++++---
 .../Libraries/Network/RCTFileRequestHandler.mm      | 13 +++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/react-native/Libraries/Network/RCTDataRequestHandler.mm b/packages/react-native/Libraries/Network/RCTDataRequestHandler.mm
index f95d0c078e0d5a..04be92732f1c53 100644
--- a/packages/react-native/Libraries/Network/RCTDataRequestHandler.mm
+++ b/packages/react-native/Libraries/Network/RCTDataRequestHandler.mm
@@ -40,6 +40,11 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
 
   __weak __block NSBlockOperation *weakOp;
   __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
+    NSBlockOperation *strongOp = weakOp;  // Strong reference to avoid deallocation during execution
+    if (strongOp == nil || [strongOp isCancelled]) {
+      return;
+    }
+
     // Get mime type
     NSRange firstSemicolon = [request.URL.resourceSpecifier rangeOfString:@";"];
     NSString *mimeType =
@@ -51,15 +56,15 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
                                            expectedContentLength:-1
                                                 textEncodingName:nil];
 
-    [delegate URLRequest:weakOp didReceiveResponse:response];
+    [delegate URLRequest:strongOp didReceiveResponse:response];
 
     // Load data
     NSError *error;
     NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
     if (data) {
-      [delegate URLRequest:weakOp didReceiveData:data];
+      [delegate URLRequest:strongOp didReceiveData:data];
     }
-    [delegate URLRequest:weakOp didCompleteWithError:error];
+    [delegate URLRequest:strongOp didCompleteWithError:error];
   }];
 
   weakOp = op;
diff --git a/packages/react-native/Libraries/Network/RCTFileRequestHandler.mm b/packages/react-native/Libraries/Network/RCTFileRequestHandler.mm
index 5838e167f96d55..2f805a43c5b36f 100644
--- a/packages/react-native/Libraries/Network/RCTFileRequestHandler.mm
+++ b/packages/react-native/Libraries/Network/RCTFileRequestHandler.mm
@@ -48,12 +48,17 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
 
   __weak __block NSBlockOperation *weakOp;
   __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
+    NSBlockOperation *strongOp = weakOp;  // Strong reference to avoid deallocation during execution
+    if (strongOp == nil || [strongOp isCancelled]) {
+      return;
+    }
+
     // Get content length
     NSError *error = nil;
     NSFileManager *fileManager = [NSFileManager new];
     NSDictionary<NSString *, id> *fileAttributes = [fileManager attributesOfItemAtPath:request.URL.path error:&error];
     if (!fileAttributes) {
-      [delegate URLRequest:weakOp didCompleteWithError:error];
+      [delegate URLRequest:strongOp didCompleteWithError:error];
       return;
     }
 
@@ -70,14 +75,14 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
                                            expectedContentLength:[fileAttributes[NSFileSize] ?: @-1 integerValue]
                                                 textEncodingName:nil];
 
-    [delegate URLRequest:weakOp didReceiveResponse:response];
+    [delegate URLRequest:strongOp didReceiveResponse:response];
 
     // Load data
     NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
     if (data) {
-      [delegate URLRequest:weakOp didReceiveData:data];
+      [delegate URLRequest:strongOp didReceiveData:data];
     }
-    [delegate URLRequest:weakOp didCompleteWithError:error];
+    [delegate URLRequest:strongOp didCompleteWithError:error];
   }];
 
   weakOp = op;

From 4dd46a802fc1c2cc1b141907cc35bba282810200 Mon Sep 17 00:00:00 2001
From: Saad Najmi <sanajmi@microsoft.com>
Date: Thu, 27 Feb 2025 00:42:01 -0800
Subject: [PATCH 2/2] Add macOS tags

---
 .../Libraries/Network/RCTDataRequestHandler.mm         |  8 +++++---
 .../Libraries/Network/RCTFileRequestHandler.mm         | 10 ++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/react-native/Libraries/Network/RCTDataRequestHandler.mm b/packages/react-native/Libraries/Network/RCTDataRequestHandler.mm
index 04be92732f1c53..6e1cb74eb26c19 100644
--- a/packages/react-native/Libraries/Network/RCTDataRequestHandler.mm
+++ b/packages/react-native/Libraries/Network/RCTDataRequestHandler.mm
@@ -40,10 +40,12 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
 
   __weak __block NSBlockOperation *weakOp;
   __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
+    // [macOS
     NSBlockOperation *strongOp = weakOp;  // Strong reference to avoid deallocation during execution
     if (strongOp == nil || [strongOp isCancelled]) {
       return;
     }
+    // macOS]
 
     // Get mime type
     NSRange firstSemicolon = [request.URL.resourceSpecifier rangeOfString:@";"];
@@ -56,15 +58,15 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
                                            expectedContentLength:-1
                                                 textEncodingName:nil];
 
-    [delegate URLRequest:strongOp didReceiveResponse:response];
+    [delegate URLRequest:strongOp didReceiveResponse:response]; // [macOS]
 
     // Load data
     NSError *error;
     NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
     if (data) {
-      [delegate URLRequest:strongOp didReceiveData:data];
+      [delegate URLRequest:strongOp didReceiveData:data]; // [macOS]
     }
-    [delegate URLRequest:strongOp didCompleteWithError:error];
+    [delegate URLRequest:strongOp didCompleteWithError:error]; // [macOS]
   }];
 
   weakOp = op;
diff --git a/packages/react-native/Libraries/Network/RCTFileRequestHandler.mm b/packages/react-native/Libraries/Network/RCTFileRequestHandler.mm
index 2f805a43c5b36f..a4ee3eda6d72f4 100644
--- a/packages/react-native/Libraries/Network/RCTFileRequestHandler.mm
+++ b/packages/react-native/Libraries/Network/RCTFileRequestHandler.mm
@@ -48,17 +48,19 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
 
   __weak __block NSBlockOperation *weakOp;
   __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
+    // [macOS
     NSBlockOperation *strongOp = weakOp;  // Strong reference to avoid deallocation during execution
     if (strongOp == nil || [strongOp isCancelled]) {
       return;
     }
+    // macOS]
 
     // Get content length
     NSError *error = nil;
     NSFileManager *fileManager = [NSFileManager new];
     NSDictionary<NSString *, id> *fileAttributes = [fileManager attributesOfItemAtPath:request.URL.path error:&error];
     if (!fileAttributes) {
-      [delegate URLRequest:strongOp didCompleteWithError:error];
+      [delegate URLRequest:strongOp didCompleteWithError:error]; // [macOS]
       return;
     }
 
@@ -75,14 +77,14 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
                                            expectedContentLength:[fileAttributes[NSFileSize] ?: @-1 integerValue]
                                                 textEncodingName:nil];
 
-    [delegate URLRequest:strongOp didReceiveResponse:response];
+    [delegate URLRequest:strongOp didReceiveResponse:response]; // [macOS]
 
     // Load data
     NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
     if (data) {
-      [delegate URLRequest:strongOp didReceiveData:data];
+      [delegate URLRequest:strongOp didReceiveData:data]; // [macOS]
     }
-    [delegate URLRequest:strongOp didCompleteWithError:error];
+    [delegate URLRequest:strongOp didCompleteWithError:error]; // [macOS]
   }];
 
   weakOp = op;