fix: cherry pick "[iOS] Reland: avoid race condition crash in [RCTDataRequestHandler invalidate]" (#2450)

Cherry pick facebook#50342 , which
fixes a bug with our fix from #2383

I chose to omit the macOS tags as this is a cherry-pick.

Co-authored-by: zhongwuzw <[email protected]>

Author: Saadnajmi

packages/react-native/Libraries/Network/RCTDataRequestHandler.mm

@@ -38,15 +38,13 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
     _queue.maxConcurrentOperationCount = 2;
   }
 
-  __weak __block NSBlockOperation *weakOp;
-  __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
-    // [macOS
-    NSBlockOperation *strongOp = weakOp;  // Strong reference to avoid deallocation during execution
+  NSBlockOperation *op = [NSBlockOperation new];
+  __weak NSBlockOperation *weakOp = op;
+  [op addExecutionBlock:^{
+    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:@";"];
     NSString *mimeType =
@@ -58,18 +56,17 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
                                            expectedContentLength:-1
                                                 textEncodingName:nil];
 
-    [delegate URLRequest:strongOp didReceiveResponse:response]; // [macOS]
+    [delegate URLRequest:strongOp didReceiveResponse:response];
 
     // Load data
     NSError *error;
     NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
     if (data) {
-      [delegate URLRequest:strongOp didReceiveData:data]; // [macOS]
+      [delegate URLRequest:strongOp didReceiveData:data];
     }
-    [delegate URLRequest:strongOp didCompleteWithError:error]; // [macOS]
+    [delegate URLRequest:strongOp didCompleteWithError:error];
   }];
 
-  weakOp = op;
   [_queue addOperation:op];
   return op;
 }

packages/react-native/Libraries/Network/RCTFileRequestHandler.mm

@@ -46,21 +46,19 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
     _fileQueue.maxConcurrentOperationCount = 4;
   }
 
-  __weak __block NSBlockOperation *weakOp;
-  __block NSBlockOperation *op = [NSBlockOperation blockOperationWithBlock:^{
-    // [macOS
-    NSBlockOperation *strongOp = weakOp;  // Strong reference to avoid deallocation during execution
+  NSBlockOperation *op = [NSBlockOperation new];
+  __weak NSBlockOperation *weakOp = op;
+  [op addExecutionBlock:^{
+    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]; // [macOS]
+      [delegate URLRequest:strongOp didCompleteWithError:error];
       return;
     }
 
@@ -77,17 +75,16 @@ - (NSOperation *)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequ
                                            expectedContentLength:[fileAttributes[NSFileSize] ?: @-1 integerValue]
                                                 textEncodingName:nil];
 
-    [delegate URLRequest:strongOp didReceiveResponse:response]; // [macOS]
+    [delegate URLRequest:strongOp didReceiveResponse:response];
 
     // Load data
     NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
     if (data) {
-      [delegate URLRequest:strongOp didReceiveData:data]; // [macOS]
+      [delegate URLRequest:strongOp didReceiveData:data];
     }
-    [delegate URLRequest:strongOp didCompleteWithError:error]; // [macOS]
+    [delegate URLRequest:strongOp didCompleteWithError:error];
   }];
 
-  weakOp = op;
   [_fileQueue addOperation:op];
   return op;
 }