fix: fix defects according to Coverity Scan

rime · Apr 5, 2018 · 526a91d · 526a91d
1 parent c8c64ff
commit 526a91d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/RimeWithWeasel/RimeWithWeasel.cpp b/RimeWithWeasel/RimeWithWeasel.cpp
@@ -433,7 +433,7 @@ bool RimeWithWeaselHandler::_Respond(UINT session_id, EatLine eat)
 		RimeFreeCommit(&commit);
 	}
 
-	bool is_composing;
+	bool is_composing = false;
 	RIME_STRUCT(RimeStatus, status);
 	if (RimeGetStatus(session_id, &status))
 	{

diff --git a/WeaselDeployer/Configurator.cpp b/WeaselDeployer/Configurator.cpp
@@ -202,6 +202,7 @@ int Configurator::SyncUserData() {
 		if (!rime->sync_user_data())
 		{
 			LOG(ERROR) << "Error synching user data.";
+			CloseHandle(hMutex);
 			return 1;
 		}
 		rime->join_maintenance_thread();

diff --git a/WeaselDeployer/SwitcherSettingsDialog.cpp b/WeaselDeployer/SwitcherSettingsDialog.cpp
@@ -109,10 +109,12 @@ LRESULT SwitcherSettingsDialog::OnOK(WORD, WORD code, HWND, BOOL&) {
 			}
 		}
 		if (count == 0) {
-			MessageBox(L"至少要選用一項吧。", L"小狼毫不是這般用法", MB_OK | MB_ICONEXCLAMATION);
+			MessageBox(_T("至少要選用一項吧。"), _T("小狼毫不是這般用法"), MB_OK | MB_ICONEXCLAMATION);
+			delete selection;
 			return 0;
 		}
 		api_->select_schemas(settings_, selection, count);
+		delete selection;
 	}
 	EndDialog(code);
 	return 0;

diff --git a/WeaselServer/WeaselService.cpp b/WeaselServer/WeaselService.cpp
@@ -46,6 +46,10 @@ WeaselService::WeaselService(
 
 WeaselService::~WeaselService()
 {
+	if (_stoppedEvent != NULL)
+	{
+		CloseHandle(_stoppedEvent);
+	}
 }
 
 BOOL WeaselService::Run(WeaselService &serv)

diff --git a/WeaselSetup/imesetup.cpp b/WeaselSetup/imesetup.cpp
@@ -162,11 +162,14 @@ int register_ime(const wpath& ime_path, bool register_ime, bool is_wow64, bool h
 						DWORD len = sizeof(imeFile);
 						DWORD type = 0;
 						ret = RegQueryValueEx(hSubKey, L"Ime File", NULL, &type, (LPBYTE)imeFile, &len);
-						RegCloseKey(hSubKey);
-						if (_wcsicmp(imeFile, L"weasel.ime") == 0)
+						if (ret = ERROR_SUCCESS)
 						{
-							hKL = (HKL)k;  // already there
+							if (_wcsicmp(imeFile, L"weasel.ime") == 0)
+							{
+								hKL = (HKL)k;  // already there
+							}
 						}
+						RegCloseKey(hSubKey);
 					}
 					else
 					{

diff --git a/include/WeaselCommon.h b/include/WeaselCommon.h
@@ -29,7 +29,7 @@ namespace weasel
 
 	struct TextAttribute
 	{
-		TextAttribute() {}
+		TextAttribute() : type(NONE) {}
 		TextAttribute(int _start, int _end, TextAttributeType _type) : range(_start, _end), type(_type) {}
 		TextRange range;
 		TextAttributeType type;