Fixes an issue where a semaphore timeout would cause a command execut…

…ion to return a nil result and a nil error at the same time.
Yubico · Nov 20, 2024 · ec4ed90 · ec4ed90
1 parent 72728a9
commit ec4ed90
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/YubiKit/YubiKit/Connections/NFCConnection/YKFNFCConnectionController.m b/YubiKit/YubiKit/Connections/NFCConnection/YKFNFCConnectionController.m
@@ -100,7 +100,9 @@ - (void)execute:(nonnull YKFAPDU *)command timeout:(NSTimeInterval)timeout compl
         }];
 
         // Lock the async call to enforce the sequential execution using the library dispatch queue.
-        dispatch_semaphore_wait(executionSemaphore, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC)));
+        if(dispatch_semaphore_wait(executionSemaphore, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC))) != 0) {
+            executionError = [YKFSessionError errorWithCode:YKFSessionErrorReadTimeoutCode];
+        }
 
         // Do not notify if the operation was canceled.
         if (operation.isCancelled) {

diff --git a/YubiKit/YubiKit/Connections/SmartCardConnection/YKFSmartCardConnectionController.m b/YubiKit/YubiKit/Connections/SmartCardConnection/YKFSmartCardConnectionController.m
@@ -131,7 +131,9 @@ - (void)execute:(nonnull YKFAPDU *)command timeout:(NSTimeInterval)timeout compl
         }];
 
         // Lock the async call to enforce the sequential execution using the library dispatch queue.
-        dispatch_semaphore_wait(executionSemaphore, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC)));
+        if(dispatch_semaphore_wait(executionSemaphore, dispatch_time(DISPATCH_TIME_NOW, (int64_t)(timeout * NSEC_PER_SEC))) != 0) {
+            executionError = [YKFSessionError errorWithCode:YKFSessionErrorReadTimeoutCode];
+        }
 
         // Do not notify if the operation was canceled.
         if (operation.isCancelled) {