From f312dbcec45174645423286d80c108f557da4415 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 24 Dec 2013 18:30:40 +0000 Subject: fix for the correct zeroing of CJabberIqInfo git-svn-id: http://svn.miranda-ng.org/main/trunk@7373 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_iq.cpp | 5 +++-- protocols/JabberG/src/jabber_iq.h | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'protocols/JabberG') 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); } -- cgit v1.2.3