From cc3fe6454fcdb63e8d096ba1677a0bee6baeb18e Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Thu, 26 Sep 2019 17:35:12 +0200 Subject: [PATCH] + check StringCchLenA() vs. strnlen_s() --- src/Helpers.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Helpers.h b/src/Helpers.h index 52827f67b..f2c10c32e 100644 --- a/src/Helpers.h +++ b/src/Helpers.h @@ -371,11 +371,18 @@ WCHAR* StrNextTokW(WCHAR* strg, const WCHAR* tokens); bool StrDelChrA(LPSTR pszSource, LPCSTR pCharsToRemove); //==== StrSafe lstrlen() ======================================================= -inline size_t StringCchLenA(LPCSTR s, size_t n) { - size_t len = (n ? n : STRSAFE_MAX_CCH); return (size_t)(!s ? 0 : (SUCCEEDED(StringCchLengthA(s, len, &len)) ? len : n)); +//inline size_t StringCchLenA(LPCSTR s, size_t n) { +// n = (n ? n : STRSAFE_MAX_CCH); size_t len; return (size_t)(!s ? 0 : (SUCCEEDED(StringCchLengthA(s, n, &len)) ? len : n)); +//} +//inline size_t StringCchLenW(LPCWSTR s, size_t n) { +// n = (n ? n : STRSAFE_MAX_CCH); size_t len; return (size_t)(!s ? 0 : (SUCCEEDED(StringCchLengthW(s, n, &len)) ? len : n)); +//} + +inline size_t StringCchLenA(LPCSTR s, size_t n) { + n = (n ? n : STRSAFE_MAX_CCH); return strnlen_s(s, n); } -inline size_t StringCchLenW(LPCWSTR s, size_t n) { - size_t len = (n ? n : STRSAFE_MAX_CCH); return (size_t)(!s ? 0 : (SUCCEEDED(StringCchLengthW(s, len, &len)) ? len : n)); +inline size_t StringCchLenW(LPCWSTR s, size_t n) { + n = (n ? n : STRSAFE_MAX_CCH); return wcsnlen_s(s, n); } #if defined(UNICODE) || defined(_UNICODE)