Merge pull request #1570 from AzureAD/kasong/main-1.12.1-compatible

force merge the CommonCore hotfix 1.12.1 into master branch
Kai : The pipeline failed due to pipeline configuration which is not capable with latest broker dev, it should not break the code.

Author: swasti29

IdentityCore/src/util/mac/MSIDXpcSingleSignOnProvider.m

@@ -70,7 +70,7 @@ @protocol MSIDXpcBrokerInstanceProtocol <NSObject>
 
 - (void)handleXpcWithRequestParams:(NSDictionary *)passedInParams
                    parentViewFrame:(NSRect)frame
-                   completionBlock:(void (^)(NSDictionary<NSString *,id> * _Nonnull, NSDate * _Nonnull, NSString * _Nonnull, NSError * _Nullable))blockName;
+                   completionBlock:(void (^)(NSDictionary<NSString *,id> * _Nullable, NSDate * _Nonnull, NSString * _Nonnull, NSError * _Nullable))blockName;
 
 - (void)canPerformWithMetadata:(NSDictionary *)passedInParams
                completionBlock:(void (^)(BOOL))blockName;
@@ -115,7 +115,7 @@ - (void)handleRequestParam:(NSDictionary *)requestParam
             return;
         }
 
-        [xpcService handleXpcWithRequestParams:requestParam parentViewFrame:frame completionBlock:^(NSDictionary<NSString *,id> * _Nonnull replyParam, NSDate * _Nonnull __unused xpcStartDate, NSString * _Nonnull __unused processId, NSError * _Nonnull callbackError) {
+        [xpcService handleXpcWithRequestParams:requestParam parentViewFrame:frame completionBlock:^(NSDictionary<NSString *,id> * _Nullable replyParam, NSDate * _Nonnull __unused xpcStartDate, NSString * _Nonnull __unused processId, NSError * _Nullable callbackError) {
             [directConnection suspend];
             [directConnection invalidate];
 
@@ -415,8 +415,6 @@ - (void)getXpcService:(id<MSIDXpcProviderCaching>)xpcProviderCache withContinueB
             continueBlock(nil, nil, xpcError);
             return;
         }
-        
-        if (continueBlock) continueBlock(nil, nil, xpcError);
     }];
 
     id<MSIDXpcBrokerDispatcherProtocol> parentXpcService = [connection remoteObjectProxyWithErrorHandler:^(NSError * _Nonnull error) {

changelog.txt

@@ -10,6 +10,10 @@ Version 1.13.0
 * Improve JIT troubleshooting in legacy auth flow (#1535)
 * Added ephemeral browser session to DUNA (#1534)
 
+Version 1.12.1
+* Remove a line that could cause crash when XPC service refuse to take the incoming connection (#1566)
+* Resolve UBSan issue due to Xpc protocol I/O  (#1566)
+
 Version 1.12.0
 * Add classes to define jwe_crypto and APV (#1522)
 * Add Request class to get nonce from server (#1525)