diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-12-24 18:30:40 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-12-24 18:30:40 +0000 |
| commit | f312dbcec45174645423286d80c108f557da4415 (patch) | |
| tree | 5550a01031f17886a8757649d14d0f4e45101ab1 /protocols/JabberG | |
| parent | 38c623b058e34a49e6cd8e4a2a552c22075d980b (diff) | |
fix for the correct zeroing of CJabberIqInfo
git-svn-id: http://svn.miranda-ng.org/main/trunk@7373 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber_iq.cpp | 5 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_iq.h | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp index 6b084c0c3c..3e2d823fbb 100644 --- a/protocols/JabberG/src/jabber_iq.cpp +++ b/protocols/JabberG/src/jabber_iq.cpp @@ -327,8 +327,9 @@ BOOL CJabberIqManager::HandleIqPermanent(HXML pNode) const TCHAR *szXmlns = xmlGetAttrValue(pFirstChild, _T("xmlns"));
if ((!pInfo->m_szXmlns || (szXmlns && !_tcscmp(pInfo->m_szXmlns, szXmlns))) &&
- (!pInfo->m_szTag || !_tcscmp(pInfo->m_szTag, szTagName))) {
- // node suits handler criteria, call the handler
+ (!pInfo->m_szTag || !_tcscmp(pInfo->m_szTag, szTagName)))
+ {
+ // node suits handler criteria, call the handler
iqInfo.m_pChildNode = pFirstChild;
iqInfo.m_szChildTagName = (TCHAR*)szTagName;
iqInfo.m_szChildTagXmlns = (TCHAR*)szXmlns;
diff --git a/protocols/JabberG/src/jabber_iq.h b/protocols/JabberG/src/jabber_iq.h index 349ea65e58..cf1c42bbe4 100644 --- a/protocols/JabberG/src/jabber_iq.h +++ b/protocols/JabberG/src/jabber_iq.h @@ -48,7 +48,7 @@ typedef BOOL (CJabberProto::*JABBER_PERMANENT_IQ_HANDLER)(HXML iqNode, CJabberIq #define JABBER_IQ_PARSE_DEFAULT (JABBER_IQ_PARSE_CHILD_TAG_NODE | JABBER_IQ_PARSE_CHILD_TAG_NAME | JABBER_IQ_PARSE_CHILD_TAG_XMLNS)
-class CJabberIqInfo : public MZeroedObject
+class CJabberIqInfo
{
protected:
friend class CJabberIqManager;
@@ -74,6 +74,11 @@ public: TCHAR *m_szId;
public:
+ __forceinline CJabberIqInfo()
+ {
+ memset(this, 0, sizeof(*this));
+ }
+
__forceinline void SetReceiver(const TCHAR *szReceiver)
{ replaceStrT(m_szReceiver, szReceiver);
}
|