diff options
| author | Sergey (Elzor) Bolhovskoy <elzor@foobar2000.ru> | 2010-04-11 21:46:53 +0600 |
|---|---|---|
| committer | Sergey (Elzor) Bolhovskoy <elzor@foobar2000.ru> | 2010-04-11 21:46:53 +0600 |
| commit | 4ddae27f4a88032c29ea30dc9dc7fe75935e3499 (patch) | |
| tree | 90c8ca99ac40c686672928bbc811c4bbc55320a1 | |
| parent | e0d46b417c56390271eac7df0d1cbd3d7516d6fb (diff) | |
| parent | 44919eb31faaf5c646b8d1cb4efb5f20d8ffd82f (diff) | |
Merge branch 'stopspam_mod' into stopspam_mod_elzor
| -rw-r--r-- | stopspam.cpp | 11 | ||||
| -rw-r--r-- | utilities.cpp | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/stopspam.cpp b/stopspam.cpp index c4a3df7..7d3f5d0 100644 --- a/stopspam.cpp +++ b/stopspam.cpp @@ -54,11 +54,12 @@ MIRANDA_HOOK_EVENT(ME_DB_EVENT_ADDED, wParam, lParam) if(gbSpecialGroup) DBWriteContactSettingTString(hcntct, "CList", "Group", gbSpammersGroup.c_str()); if(gbIgnoreURL) - if(Stristr(EventText, _T("http")) || Stristr(EventText, _T("www")) || Stristr(EventText, _T(".ru")) || Stristr(EventText, _T(".com")) || Stristr(EventText, _T(".de")) || Stristr(EventText, _T(".cz")) || Stristr(EventText, _T(".org")) || Stristr(EventText, _T(".net")) || Stristr(EventText, _T(".su"))) - { - mir_free(EventText); - return 1; - } + if(_tcslen(EventText) > 0) + if(Stristr(EventText, _T("http")) || Stristr(EventText, _T("www")) || Stristr(EventText, _T(".ru")) || Stristr(EventText, _T(".com")) || Stristr(EventText, _T(".de")) || Stristr(EventText, _T(".cz")) || Stristr(EventText, _T(".org")) || Stristr(EventText, _T(".net")) || Stristr(EventText, _T(".su"))) + { + mir_free(EventText); + return 1; + } BYTE msg = 1; if(gbInvisDisable) { diff --git a/utilities.cpp b/utilities.cpp index bf61929..bfb1f47 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -150,6 +150,7 @@ tstring variables_parse(tstring const &tstrFormat, HANDLE hContact){ const int Stricmp(const TCHAR *str, const TCHAR *substr) { int i = 0; + TCHAR *str_up = NEWTSTR_MALLOC(str); TCHAR *substr_up = NEWTSTR_MALLOC(substr); |