From a8a11e811c3c0cc3f6d74c18c89841e9e0e87237 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sun, 30 Nov 2014 04:29:19 +0000 Subject: Multiple fixes buff size for GetText and SetText. git-svn-id: http://svn.miranda-ng.org/main/trunk@11165 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Variables/src/parse_external.cpp | 5 +++-- plugins/Variables/src/parse_regexp.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins/Variables/src') diff --git a/plugins/Variables/src/parse_external.cpp b/plugins/Variables/src/parse_external.cpp index dbdf91eb6c..07fc3643b6 100644 --- a/plugins/Variables/src/parse_external.cpp +++ b/plugins/Variables/src/parse_external.cpp @@ -28,11 +28,12 @@ static TCHAR *getFullWinampTitleText() if (hwndWinamp == NULL) return NULL; - TCHAR *szWinText = (TCHAR*)mir_alloc((GetWindowTextLength(hwndWinamp) + 1)*sizeof(TCHAR)); + SIZE_T dwWinTextLength = (GetWindowTextLength(hwndWinamp) + 1); + TCHAR *szWinText = (TCHAR*)mir_alloc(dwWinTextLength * sizeof(TCHAR)); if (szWinText == NULL) return NULL; - if (GetWindowText(hwndWinamp, szWinText, GetWindowTextLength(hwndWinamp) + 1) == 0) { + if (GetWindowText(hwndWinamp, szWinText, dwWinTextLength) == 0) { mir_free(szWinText); return NULL; } diff --git a/plugins/Variables/src/parse_regexp.cpp b/plugins/Variables/src/parse_regexp.cpp index 0510464c97..acb4a1c642 100644 --- a/plugins/Variables/src/parse_regexp.cpp +++ b/plugins/Variables/src/parse_regexp.cpp @@ -39,7 +39,7 @@ static TCHAR *parseRegExpCheck(ARGUMENTSINFO *ai) return NULL; pcre16_extra *extra = pcre16_study(ppat, 0, &err); - int nmat = pcre16_exec(ppat, extra, ai->targv[2], (int)lstrlen(ai->targv[2]), 0, 0, offsets, 99); + int nmat = pcre16_exec(ppat, extra, ai->targv[2], lstrlen(ai->targv[2]), 0, 0, offsets, 99); if (nmat > 0) { ai->flags &= ~AIF_FALSE; _ltoa(nmat, szVal, 10); @@ -72,7 +72,7 @@ static TCHAR *parseRegExpSubstr(ARGUMENTSINFO *ai) return NULL; pcre16_extra *extra = pcre16_study(ppat, 0, &err); - int nmat = pcre16_exec(ppat, extra, ai->targv[2], (int)lstrlen(ai->targv[2]), 0, 0, offsets, 99); + int nmat = pcre16_exec(ppat, extra, ai->targv[2], lstrlen(ai->targv[2]), 0, 0, offsets, 99); if (nmat >= 0) ai->flags &= ~AIF_FALSE; -- cgit v1.2.3