Make SCardListener dormant when service not present

Yubico · Jun 28, 2022 · 0f2100c · 0f2100c
1 parent 0dba76a
commit 0f2100c
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Yubico.Core/src/Yubico/Core/Devices/SmartCard/DesktopSmartCardDeviceListener.cs b/Yubico.Core/src/Yubico/Core/Devices/SmartCard/DesktopSmartCardDeviceListener.cs
@@ -50,6 +50,15 @@ public DesktopSmartCardDeviceListener()
             uint result = SCardEstablishContext(SCARD_SCOPE.USER, out SCardContext context);
             _log.SCardApiCall(nameof(SCardEstablishContext), result);
 
+            // If we failed to establish context to the smart card subsystem, something substantially wrong
+            // has occured. We should not continue, and the device listener should remain dormant.
+            if (result != ErrorCode.SCARD_S_SUCCESS)
+            {
+                _context = new SCardContext(IntPtr.Zero);
+                _readerStates = Array.Empty<SCARD_READER_STATE>();
+                return;
+            }
+
             _context = context;
             _readerStates = GetReaderStateList();