diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-30 17:45:03 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-30 17:45:03 +0000 |
| commit | d77850e44b6d38380c08896ba5f2e043c7c69fb2 (patch) | |
| tree | 63b253f7fa693601210886a4cac2a1713884e866 /plugins/TipperYM/subst.cpp | |
| parent | 12053939f5b0c757a2b099e90fc0b7371e8817e1 (diff) | |
mir_free won again!
git-svn-id: http://svn.miranda-ng.org/main/trunk@701 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TipperYM/subst.cpp')
| -rw-r--r-- | plugins/TipperYM/subst.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/plugins/TipperYM/subst.cpp b/plugins/TipperYM/subst.cpp index 531af67200..1d8c8837d9 100644 --- a/plugins/TipperYM/subst.cpp +++ b/plugins/TipperYM/subst.cpp @@ -568,8 +568,7 @@ bool GetRawSubstText(HANDLE hContact, char *szRawSpec, TCHAR *buff, int bufflen) bool ApplySubst(HANDLE hContact, const TCHAR *swzSource, bool parseTipperVarsFirst, TCHAR *swzDest, int iDestLen)
{
// hack - allow empty strings before passing to variables (note - zero length strings return false after this)
- if (swzDest && swzSource && _tcslen(swzSource) == 0)
- {
+ if (swzDest && swzSource && _tcslen(swzSource) == 0) {
swzDest[0] = 0;
return true;
}
@@ -579,7 +578,7 @@ bool ApplySubst(HANDLE hContact, const TCHAR *swzSource, bool parseTipperVarsFir if (parseTipperVarsFirst == false)
swzVarSrc = variables_parsedup((TCHAR *)swzSource, 0, hContact);
else
- swzVarSrc = _tcsdup(swzSource);
+ swzVarSrc = mir_tstrdup(swzSource);
size_t iSourceLen = _tcslen(swzVarSrc);
size_t si = 0, di = 0, v = 0;
@@ -779,14 +778,14 @@ bool ApplySubst(HANDLE hContact, const TCHAR *swzSource, bool parseTipperVarsFir di++;
}
- free(swzVarSrc);
+ mir_free(swzVarSrc);
swzDest[di] = 0;
if (parseTipperVarsFirst)
{
swzVarSrc = variables_parsedup((TCHAR *)swzDest, 0, hContact);
_tcscpy(swzDest, swzVarSrc);
- free(swzVarSrc);
+ mir_free(swzVarSrc);
}
@@ -800,13 +799,13 @@ bool ApplySubst(HANDLE hContact, const TCHAR *swzSource, bool parseTipperVarsFir return false;
empty:
- free(swzVarSrc);
+ mir_free(swzVarSrc);
return false;
error:
swzDest[0] = _T('*');
swzDest[1] = 0;
- free(swzVarSrc);
+ mir_free(swzVarSrc);
return true;
}
|