summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorattilamolnar <attilamolnar@hush.com>2013-04-18 13:25:28 +0200
committerattilamolnar <attilamolnar@hush.com>2013-04-18 13:25:28 +0200
commit5ca81cf89a1d7cf78a2bb078a25305c1ebab8746 (patch)
treec6d8344f69145f0d5786a5450bbb3f06506032bd
parent82c53822ecef034b1b88f47ebaa13b4d8c8ac836 (diff)
m_callerid Ignore duplicate entries when unserializing callerid_data
-rw-r--r--src/modules/m_callerid.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 812df1da0..b0d6b9c64 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -82,9 +82,11 @@ struct CallerIDExtInfo : public ExtensionItem
User *u = ServerInstance->FindNick(tok);
if ((u) && (u->registered == REG_ALL) && (!u->quitting) && (!IS_SERVER(u)))
{
- callerid_data* other = this->get(u, true);
- other->wholistsme.push_back(dat);
- dat->accepting.insert(u);
+ if (dat->accepting.insert(u).second)
+ {
+ callerid_data* other = this->get(u, true);
+ other->wholistsme.push_back(dat);
+ }
}
}