From 903cf85316f641a2d7fcc7fb87ed75889469d2dc Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss123next@list.ru>
Date: Wed, 30 Mar 2011 09:36:35 +0300
Subject: some agression )

---
 messages.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'messages.cpp')

diff --git a/messages.cpp b/messages.cpp
index 3426b5e..226445a 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -156,6 +156,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags)
 				if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
 				{
 					delete gpg_thread;
+					TerminateProcess(params.hProcess, 1);
 					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 					DeleteFile(path.c_str());
 					HistoryLog(hContact, msg, EVENTTYPE_MESSAGE, dbflags);
@@ -205,6 +206,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags)
 					if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
 					{
 						delete gpg_thread;
+						TerminateProcess(params.hProcess, 1);
 						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 						DeleteFile(path.c_str());
 						HistoryLog(hContact, msg, EVENTTYPE_MESSAGE, dbflags);
@@ -222,6 +224,7 @@ int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags)
 				if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
 				{
 					delete gpg_thread;
+					TerminateProcess(params.hProcess, 1);
 					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 					DeleteFile(path.c_str());
 					HistoryLog(hContact, msg, EVENTTYPE_MESSAGE, dbflags);
@@ -385,6 +388,7 @@ int RecvMsgSvc(WPARAM w, LPARAM l)
 				if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 				{
 					gpg_thread.~thread();
+					TerminateProcess(params.hProcess, 1);
 					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 					return 1;
 				}
@@ -638,6 +642,7 @@ int SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 	if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 	{
 		gpg_thread.~thread();
+		TerminateProcess(params.hProcess, 1);
 		debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 		mir_free(msg);
 		return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
@@ -665,6 +670,7 @@ int SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
 			if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
 			{
 				gpg_thread.~thread();
+				TerminateProcess(params.hProcess, 1);
 				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
 				mir_free(msg);
 				return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
-- 
cgit v1.2.3