summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikalaiR <nikolay.romanovich@narod.ru>2015-04-20 08:15:27 +0000
committerMikalaiR <nikolay.romanovich@narod.ru>2015-04-20 08:15:27 +0000
commit8429513ae275d2e10d9c991b810720830a127e06 (patch)
treee01ba371601d58c7c8531e58527f3f8a7b0ab3dd
parenta76f31eb06923058dedc293368e605a66cc71624 (diff)
SkypeWeb: Crash fix.
git-svn-id: http://svn.miranda-ng.org/main/trunk@12956 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/SkypeWeb/src/skype_history_sync.cpp4
-rw-r--r--protocols/SkypeWeb/src/skype_messages.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp
index 2bd1b2fa7c..df5d4044a7 100644
--- a/protocols/SkypeWeb/src/skype_history_sync.cpp
+++ b/protocols/SkypeWeb/src/skype_history_sync.cpp
@@ -100,7 +100,7 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response)
//content=<partlist type="started" alt=""><part identity="username"><name>user name</name></part></partlist>
MCONTACT hContact = FindContact(ptrA(ContactUrlToName(conversationLink)));
ptrA name;
- int iType, iDuration;
+ int iType = 3, iDuration = 0;
ptrA skypename(ContactUrlToName(from));
bool isMe = IsMe(skypename);
int flags = DBEF_UTF | DBEF_READ;
@@ -117,7 +117,7 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response)
HXML xmlNode = xi.getChildByPath(xml, _T("part"), 0);
HXML duration = xmlNode == NULL ? NULL : xi.getChildByPath(xmlNode, _T("duration"), 0);
- iDuration = xmlNode != NULL ? atoi(mir_t2a(xi.getText(xmlNode))) : NULL;
+ iDuration = duration != NULL ? atoi(mir_t2a(xi.getText(duration))) : NULL;
xi.destroyNode(xml);
}
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp
index ed0520465e..33d0944ad7 100644
--- a/protocols/SkypeWeb/src/skype_messages.cpp
+++ b/protocols/SkypeWeb/src/skype_messages.cpp
@@ -276,7 +276,7 @@ void CSkypeProto::OnPrivateMessageEvent(JSONNODE *node)
HXML xmlNode = xi.getChildByPath(xml, _T("part"), 0);
HXML duration = xmlNode == NULL ? NULL : xi.getChildByPath(xmlNode, _T("duration"), 0);
- iDuration = xmlNode != NULL ? atoi(mir_t2a(xi.getText(xmlNode))) : NULL;
+ iDuration = duration != NULL ? atoi(mir_t2a(xi.getText(duration))) : NULL;
xi.destroyNode(xml);
}