From 6697353504ff98e34d87a3ce1d300ab0854b9247 Mon Sep 17 00:00:00 2001
From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com>
Date: Thu, 9 May 2024 20:18:35 +0700
Subject: [PATCH 1/2] patch

---
 sdk/objc/api/peerconnection/RTCFieldTrials.mm | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/sdk/objc/api/peerconnection/RTCFieldTrials.mm b/sdk/objc/api/peerconnection/RTCFieldTrials.mm
index 193da9e4f7..59aed2e33b 100644
--- a/sdk/objc/api/peerconnection/RTCFieldTrials.mm
+++ b/sdk/objc/api/peerconnection/RTCFieldTrials.mm
@@ -17,40 +17,51 @@
 #include "system_wrappers/include/field_trial.h"
 
 NSString *const kRTCFieldTrialAudioForceABWENoTWCCKey = @"WebRTC-Audio-ABWENoTWCC";
-NSString * const kRTCFieldTrialFlexFec03AdvertisedKey = @"WebRTC-FlexFEC-03-Advertised";
-NSString * const kRTCFieldTrialFlexFec03Key = @"WebRTC-FlexFEC-03";
-NSString * const kRTCFieldTrialH264HighProfileKey = @"WebRTC-H264HighProfile";
-NSString * const kRTCFieldTrialMinimizeResamplingOnMobileKey =
+NSString *const kRTCFieldTrialFlexFec03AdvertisedKey = @"WebRTC-FlexFEC-03-Advertised";
+NSString *const kRTCFieldTrialFlexFec03Key = @"WebRTC-FlexFEC-03";
+NSString *const kRTCFieldTrialH264HighProfileKey = @"WebRTC-H264HighProfile";
+NSString *const kRTCFieldTrialMinimizeResamplingOnMobileKey =
     @"WebRTC-Audio-MinimizeResamplingOnMobile";
 NSString *const kRTCFieldTrialUseNWPathMonitor = @"WebRTC-Network-UseNWPathMonitor";
-NSString * const kRTCFieldTrialEnabledValue = @"Enabled";
+NSString *const kRTCFieldTrialEnabledValue = @"Enabled";
 
 // InitFieldTrialsFromString stores the char*, so the char array must outlive
 // the application.
 static char *gFieldTrialInitString = nullptr;
+static os_unfair_lock fieldTrialLock = OS_UNFAIR_LOCK_INIT;
 
 void RTCInitFieldTrialDictionary(NSDictionary<NSString *, NSString *> *fieldTrials) {
   if (!fieldTrials) {
     RTCLogWarning(@"No fieldTrials provided.");
     return;
   }
+
   // Assemble the keys and values into the field trial string.
-  // We don't perform any extra format checking. That should be done by the underlying WebRTC calls.
   NSMutableString *fieldTrialInitString = [NSMutableString string];
   for (NSString *key in fieldTrials) {
     NSString *fieldTrialEntry = [NSString stringWithFormat:@"%@/%@/", key, fieldTrials[key]];
     [fieldTrialInitString appendString:fieldTrialEntry];
   }
+
   size_t len = fieldTrialInitString.length + 1;
+
+  // Locking before modifying global variable
+  os_unfair_lock_lock(&fieldTrialLock);
   if (gFieldTrialInitString != nullptr) {
     delete[] gFieldTrialInitString;
+    gFieldTrialInitString = nullptr;
   }
+
   gFieldTrialInitString = new char[len];
-  if (![fieldTrialInitString getCString:gFieldTrialInitString
-                              maxLength:len
-                               encoding:NSUTF8StringEncoding]) {
+  bool success = [fieldTrialInitString getCString:gFieldTrialInitString
+                                        maxLength:len
+                                         encoding:NSUTF8StringEncoding];
+  if (!success) {
     RTCLogError(@"Failed to convert field trial string.");
+    os_unfair_lock_unlock(&fieldTrialLock);
     return;
   }
+
   webrtc::field_trial::InitFieldTrialsFromString(gFieldTrialInitString);
+  os_unfair_lock_unlock(&fieldTrialLock);
 }

From e31bb3d96a04f03c9b9a9f72de0a11f8d38c3032 Mon Sep 17 00:00:00 2001
From: Hiroshi Horie <548776+hiroshihorie@users.noreply.github.com>
Date: Thu, 9 May 2024 20:26:27 +0700
Subject: [PATCH 2/2] add missing import

---
 sdk/objc/api/peerconnection/RTCFieldTrials.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/objc/api/peerconnection/RTCFieldTrials.mm b/sdk/objc/api/peerconnection/RTCFieldTrials.mm
index 59aed2e33b..b5a2eca8f0 100644
--- a/sdk/objc/api/peerconnection/RTCFieldTrials.mm
+++ b/sdk/objc/api/peerconnection/RTCFieldTrials.mm
@@ -10,8 +10,8 @@
 
 #import "RTCFieldTrials.h"
 
+#import <os/lock.h>
 #include <memory>
-
 #import "base/RTCLogging.h"
 
 #include "system_wrappers/include/field_trial.h"