From 492824156dfb9eba266dde69398314913b479a45 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Sat, 17 Dec 2022 04:56:16 +0100 Subject: [PATCH] [darwin-framework-tool] The stack is not properly turned off on timeout (#24111) --- .../commands/common/CHIPCommandBridge.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm index 7294df0c8a5ad9..5a70f15a1c0b33 100644 --- a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm +++ b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm @@ -41,7 +41,8 @@ ReturnErrorOnFailure(MaybeSetUpStack()); SetIdentity(mCommissionerName.HasValue() ? mCommissionerName.Value() : kIdentityAlpha); ReturnLogErrorOnFailure(RunCommand()); - ReturnLogErrorOnFailure(StartWaiting(GetWaitDuration())); + + auto err = StartWaiting(GetWaitDuration()); bool deferCleanup = (IsInteractive() && DeferInteractiveCleanup()); @@ -54,7 +55,7 @@ } MaybeTearDownStack(); - return CHIP_NO_ERROR; + return err; } CHIP_ERROR CHIPCommandBridge::GetPAACertsFromFolder(NSArray * __autoreleasing * paaCertsResult)