5376074954
- 重构部分代码 修复在resetUkey和析构函数中重复调用disConnectDev释放相同的设备句柄从而导致崩溃的问题 虹膜人脸一体设备在拔出时无法释放内存并且会阻塞进程，当释放人脸虹膜设备对象时，如果当前设备已经被拔出了，就重启服务，释放资源。 （#25243） 启用驱动时，扫描当前设备，创建对应的设备对象；禁用驱动时，释放当前对应的设备对象 （#25387） 修复文件安装路径错误
31 lines
987 B
Diff
31 lines
987 B
Diff
From 5b329ca4e7610efb23b7077d5af201290bd3fb61 Mon Sep 17 00:00:00 2001
|
|
From: luoqing <luoqing@kylinsec.com.cn>
|
|
Date: Mon, 3 Jul 2023 16:41:09 +0800
|
|
Subject: [PATCH 2/6] fix(ukey-manager):Fixed a crash caused by repeatedly
|
|
calling disConnectDev in resetUkey and destructor to release the same device
|
|
handle
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 修复在resetUkey和析构函数中重复调用disConnectDev释放相同的设备句柄从而导致崩溃的问题
|
|
---
|
|
ukey-manager/ukey-manager.cpp | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/ukey-manager/ukey-manager.cpp b/ukey-manager/ukey-manager.cpp
|
|
index 30cd23a..d815d72 100644
|
|
--- a/ukey-manager/ukey-manager.cpp
|
|
+++ b/ukey-manager/ukey-manager.cpp
|
|
@@ -62,7 +62,6 @@ bool UkeyManager::initDriver()
|
|
ULONG UkeyManager::resetUkey()
|
|
{
|
|
ULONG ulReval = m_driver->resetUkey(m_devHandle);
|
|
- m_driver->disConnectDev(m_devHandle);
|
|
return ulReval;
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|