SkypeWeb: Crash fix(?).

git-svn-id: http://svn.miranda-ng.org/main/trunk@12893 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 257 insertions, 12 deletions

diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp
index 72081578dc..7b595ba8e3 100644
--- a/protocols/SkypeWeb/src/skype_history_sync.cpp
+++ b/protocols/SkypeWeb/src/skype_history_sync.cpp
@@ -123,6 +123,6 @@ void CSkypeProto::OnSyncHistory(const NETLIBHTTPREQUEST *response)
 		if (hContact == NULL && !IsMe(skypename))

 			hContact = AddContact(skypename, true);

 		if (GetMessageFromDb(hContact, clientMsgId, composeTime) == NULL)

-			PushRequest(new GetHistoryRequest(ptrA(getStringA("registrationToken")), skypename, ptrA(getStringA("Server"))), &CSkypeProto::OnGetServerHistory);

+			PushRequest(new GetHistoryRequest(ptrA(getStringA("registrationToken")), skypename, 0, ptrA(getStringA("Server"))), &CSkypeProto::OnGetServerHistory);

 	}

 }
\ No newline at end of file
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp
index 7a6f9f682d..289793a457 100644
--- a/protocols/SkypeWeb/src/skype_utils.cpp
+++ b/protocols/SkypeWeb/src/skype_utils.cpp
@@ -1,4 +1,4 @@
-/*

+/*

 Copyright (c) 2015 Miranda NG project (http://miranda-ng.org)

 

 This program is free software; you can redistribute it and/or

@@ -97,19 +97,264 @@ time_t CSkypeProto::IsoToUnixTime(const TCHAR *stamp)
 struct HtmlEntity

 {

 	const char *entity;

-	char symbol;

+	const char *symbol;

 };

 

 const HtmlEntity htmlEntities[] =

 {

-	{ "nbsp", ' ' },

-	{ "amp", '&' },

-	{ "quot", '"' },

-	{ "lt", '<' },

-	{ "gt", '>' },

-	{ "apos", '\'' },

-	{ "copy", '�' },

-	// TODO: add more

+	{ "AElig;", "Æ" },

+	{ "Aacute;", "Á" },

+	{ "Acirc;", "Â" },

+	{ "Agrave;", "À" },

+	{ "Alpha;", "Α" },

+	{ "Aring;", "Å" },

+	{ "Atilde;", "Ã" },

+	{ "Auml;", "Ä" },

+	{ "Beta;", "Β" },

+	{ "Ccedil;", "Ç" },

+	{ "Chi;", "Χ" },

+	{ "Dagger;", "‡" },

+	{ "Delta;", "Δ" },

+	{ "ETH;", "Ð" },

+	{ "Eacute;", "É" },

+	{ "Ecirc;", "Ê" },

+	{ "Egrave;", "È" },

+	{ "Epsilon;", "Ε" },

+	{ "Eta;", "Η" },

+	{ "Euml;", "Ë" },

+	{ "Gamma;", "Γ" },

+	{ "Iacute;", "Í" },

+	{ "Icirc;", "Î" },

+	{ "Igrave;", "Ì" },

+	{ "Iota;", "Ι" },

+	{ "Iuml;", "Ï" },

+	{ "Kappa;", "Κ" },

+	{ "Lambda;", "Λ" },

+	{ "Mu;", "Μ" },

+	{ "Ntilde;", "Ñ" },

+	{ "Nu;", "Ν" },

+	{ "OElig;", "Œ" },

+	{ "Oacute;", "Ó" },

+	{ "Ocirc;", "Ô" },

+	{ "Ograve;", "Ò" },

+	{ "Omega;", "Ω" },

+	{ "Omicron;", "Ο" },

+	{ "Oslash;", "Ø" },

+	{ "Otilde;", "Õ" },

+	{ "Ouml;", "Ö" },

+	{ "Phi;", "Φ" },

+	{ "Pi;", "Π" },

+	{ "Prime;", "″" },

+	{ "Psi;", "Ψ" },

+	{ "Rho;", "Ρ" },

+	{ "Scaron;", "Š" },

+	{ "Sigma;", "Σ" },

+	{ "THORN;", "Þ" },

+	{ "Tau;", "Τ" },

+	{ "Theta;", "Θ" },

+	{ "Uacute;", "Ú" },

+	{ "Ucirc;", "Û" },

+	{ "Ugrave;", "Ù" },

+	{ "Upsilon;", "Υ" },

+	{ "Uuml;", "Ü" },

+	{ "Xi;", "Ξ" },

+	{ "Yacute;", "Ý" },

+	{ "Yuml;", "Ÿ" },

+	{ "Zeta;", "Ζ" },

+	{ "aacute;", "á" },

+	{ "acirc;", "â" },

+	{ "acute;", "´" },

+	{ "aelig;", "æ" },

+	{ "agrave;", "à" },

+	{ "alefsym;", "ℵ" },

+	{ "alpha;", "α" },

+	{ "amp;", "&" },

+	{ "and;", "∧" },

+	{ "ang;", "∠" },

+	{ "apos;", "'" },

+	{ "aring;", "å" },

+	{ "asymp;", "≈" },

+	{ "atilde;", "ã" },

+	{ "auml;", "ä" },

+	{ "bdquo;", "„" },

+	{ "beta;", "β" },

+	{ "brvbar;", "¦" },

+	{ "bull;", "•" },

+	{ "cap;", "∩" },

+	{ "ccedil;", "ç" },

+	{ "cedil;", "¸" },

+	{ "cent;", "¢" },

+	{ "chi;", "χ" },

+	{ "circ;", "ˆ" },

+	{ "clubs;", "♣" },

+	{ "cong;", "≅" },

+	{ "copy;", "©" },

+	{ "crarr;", "↵" },

+	{ "cup;", "∪" },

+	{ "curren;", "¤" },

+	{ "dArr;", "⇓" },

+	{ "dagger;", "†" },

+	{ "darr;", "↓" },

+	{ "deg;", "°" },

+	{ "delta;", "δ" },

+	{ "diams;", "♦" },

+	{ "divide;", "÷" },

+	{ "eacute;", "é" },

+	{ "ecirc;", "ê" },

+	{ "egrave;", "è" },

+	{ "empty;", "∅" },

+	{ "emsp;", " " },

+	{ "ensp;", " " },

+	{ "epsilon;", "ε" },

+	{ "equiv;", "≡" },

+	{ "eta;", "η" },

+	{ "eth;", "ð" },

+	{ "euml;", "ë" },

+	{ "euro;", "€" },

+	{ "exist;", "∃" },

+	{ "fnof;", "ƒ" },

+	{ "forall;", "∀" },

+	{ "frac12;", "½" },

+	{ "frac14;", "¼" },

+	{ "frac34;", "¾" },

+	{ "frasl;", "⁄" },

+	{ "gamma;", "γ" },

+	{ "ge;", "≥" },

+	{ "gt;", ">" },

+	{ "hArr;", "⇔" },

+	{ "harr;", "↔" },

+	{ "hearts;", "♥" },

+	{ "hellip;", "…" },

+	{ "iacute;", "í" },

+	{ "icirc;", "î" },

+	{ "iexcl;", "¡" },

+	{ "igrave;", "ì" },

+	{ "image;", "ℑ" },

+	{ "infin;", "∞" },

+	{ "int;", "∫" },

+	{ "iota;", "ι" },

+	{ "iquest;", "¿" },

+	{ "isin;", "∈" },

+	{ "iuml;", "ï" },

+	{ "kappa;", "κ" },

+	{ "lArr;", "⇐" },

+	{ "lambda;", "λ" },

+	{ "lang;", "〈" },

+	{ "laquo;", "«" },

+	{ "larr;", "←" },

+	{ "lceil;", "⌈" },

+	{ "ldquo;", "“" },

+	{ "le;", "≤" },

+	{ "lfloor;", "⌊" },

+	{ "lowast;", "∗" },

+	{ "loz;", "◊" },

+	{ "lrm;", "\xE2\x80\x8E" },

+	{ "lsaquo;", "‹" },

+	{ "lsquo;", "‘" },

+	{ "lt;", "<" },

+	{ "macr;", "¯" },

+	{ "mdash;", "—" },

+	{ "micro;", "µ" },

+	{ "middot;", "·" },

+	{ "minus;", "−" },

+	{ "mu;", "μ" },

+	{ "nabla;", "∇" },

+	{ "nbsp;", " " },

+	{ "ndash;", "–" },

+	{ "ne;", "≠" },

+	{ "ni;", "∋" },

+	{ "not;", "¬" },

+	{ "notin;", "∉" },

+	{ "nsub;", "⊄" },

+	{ "ntilde;", "ñ" },

+	{ "nu;", "ν" },

+	{ "oacute;", "ó" },

+	{ "ocirc;", "ô" },

+	{ "oelig;", "œ" },

+	{ "ograve;", "ò" },

+	{ "oline;", "‾" },

+	{ "omega;", "ω" },

+	{ "omicron;", "ο" },

+	{ "oplus;", "⊕" },

+	{ "or;", "∨" },

+	{ "ordf;", "ª" },

+	{ "ordm;", "º" },

+	{ "oslash;", "ø" },

+	{ "otilde;", "õ" },

+	{ "otimes;", "⊗" },

+	{ "ouml;", "ö" },

+	{ "para;", "¶" },

+	{ "part;", "∂" },

+	{ "permil;", "‰" },

+	{ "perp;", "⊥" },

+	{ "phi;", "φ" },

+	{ "pi;", "π" },

+	{ "piv;", "ϖ" },

+	{ "plusmn;", "±" },

+	{ "pound;", "£" },

+	{ "prime;", "′" },

+	{ "prod;", "∏" },

+	{ "prop;", "∝" },

+	{ "psi;", "ψ" },

+	{ "quot;", "\"" },

+	{ "rArr;", "⇒" },

+	{ "radic;", "√" },

+	{ "rang;", "〉" },

+	{ "raquo;", "»" },

+	{ "rarr;", "→" },

+	{ "rceil;", "⌉" },

+	{ "rdquo;", "”" },

+	{ "real;", "ℜ" },

+	{ "reg;", "®" },

+	{ "rfloor;", "⌋" },

+	{ "rho;", "ρ" },

+	{ "rlm;", "\xE2\x80\x8F" },

+	{ "rsaquo;", "›" },

+	{ "rsquo;", "’" },

+	{ "sbquo;", "‚" },

+	{ "scaron;", "š" },

+	{ "sdot;", "⋅" },

+	{ "sect;", "§" },

+	{ "shy;", "\xC2\xAD" },

+	{ "sigma;", "σ" },

+	{ "sigmaf;", "ς" },

+	{ "sim;", "∼" },

+	{ "spades;", "♠" },

+	{ "sub;", "⊂" },

+	{ "sube;", "⊆" },

+	{ "sum;", "∑" },

+	{ "sup;", "⊃" },

+	{ "sup1;", "¹" },

+	{ "sup2;", "²" },

+	{ "sup3;", "³" },

+	{ "supe;", "⊇" },

+	{ "szlig;", "ß" },

+	{ "tau;", "τ" },

+	{ "there4;", "∴" },

+	{ "theta;", "θ" },

+	{ "thetasym;", "ϑ" },

+	{ "thinsp;", " " },

+	{ "thorn;", "þ" },

+	{ "tilde;", "˜" },

+	{ "times;", "×" },

+	{ "trade;", "™" },

+	{ "uArr;", "⇑" },

+	{ "uacute;", "ú" },

+	{ "uarr;", "↑" },

+	{ "ucirc;", "û" },

+	{ "ugrave;", "ù" },

+	{ "uml;", "¨" },

+	{ "upsih;", "ϒ" },

+	{ "upsilon;", "υ" },

+	{ "uuml;", "ü" },

+	{ "weierp;", "℘" },

+	{ "xi;", "ξ" },

+	{ "yacute;", "ý" },

+	{ "yen;", "¥" },

+	{ "yuml;", "ÿ" },

+	{ "zeta;", "ζ" },

+	{ "zwj;", "\xE2\x80\x8D" },

+	{ "zwnj;", "\xE2\x80\x8C" }

 };

 

 char *CSkypeProto::RemoveHtml(const char *text)

@@ -122,7 +367,7 @@ char *CSkypeProto::RemoveHtml(const char *text)
 

 	for (std::string::size_type i = 0; i < data.length(); i++)

 	{

-		if (data.at(i) == '<' && data.at(i + 1) != ' ')

+		if (data.at(i) == '<')

 		{

 			i = data.find(">", i);

 			if (i == std::string::npos)