From e4f89892a3e0419b91fb29de8c7d22f786e47a62 Mon Sep 17 00:00:00 2001 From: csoler Date: Mon, 11 Jul 2011 19:04:56 +0000 Subject: [PATCH] added missing mutex protection that caused random SIGSEGV git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4433 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/services/p3disc.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/services/p3disc.cc b/libretroshare/src/services/p3disc.cc index 190121f23..122d8df29 100644 --- a/libretroshare/src/services/p3disc.cc +++ b/libretroshare/src/services/p3disc.cc @@ -165,7 +165,7 @@ int p3disc::handleIncoming() // if discovery reply then respond if haven't already. - if (NULL != (dri = dynamic_cast (item))) { + if (NULL != (dri = dynamic_cast (item))) { RsStackMutex stack(mDiscMtx); /********** STACK LOCKED MTX ******/ @@ -182,17 +182,17 @@ int p3disc::handleIncoming() // add item to list for later process pendingDiscReplyInList.push_back(dri); // no delete } - else if (NULL != (dvi = dynamic_cast (item))) { + else if (NULL != (dvi = dynamic_cast (item))) { recvPeerVersionMsg(dvi); nhandled++; delete item; } - else if (NULL != (inf = dynamic_cast (item))) /* Ping */ { + else if (NULL != (inf = dynamic_cast (item))) /* Ping */ { recvAskInfo(inf); nhandled++; delete item; } - else if (NULL != (dta = dynamic_cast (item))) { + else if (NULL != (dta = dynamic_cast (item))) { recvHeartbeatMsg(dta); nhandled++ ; delete item; @@ -764,6 +764,7 @@ void p3disc::recvAskInfo(RsDiscAskInfo *item) { std::cerr << "p3disc::recvAskInfo() From: " << item->PeerId(); std::cerr << std::endl; #endif + RsStackMutex stack(mDiscMtx); /********** STACK LOCKED MTX ******/ std::list &idList = sendIdList[item->PeerId()];