[26757] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.10]: MSLSA Don't use lstrcpy on ANSI strings
daemon@ATHENA.MIT.EDU (Tom Yu)
Mon Jul 23 16:26:56 2012
Date: Mon, 23 Jul 2012 16:26:27 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201207232026.q6NKQRVC029134@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/19b38c274bbf5bb2e566b434e14915ea2b141374
commit 19b38c274bbf5bb2e566b434e14915ea2b141374
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Fri May 11 11:36:19 2012 -0400
MSLSA Don't use lstrcpy on ANSI strings
Also change parameter types to eliminate casts.
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
(cherry picked from commit 7acb524f5aa00274771dbbfac19d2dd779aad409)
ticket: 7212
version_fixed: 1.10.3
status: resolved
src/lib/krb5/ccache/cc_mslsa.c | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
index 098ba29..3d579d6 100644
--- a/src/lib/krb5/ccache/cc_mslsa.c
+++ b/src/lib/krb5/ccache/cc_mslsa.c
@@ -336,23 +336,15 @@ UnicodeToANSI(LPTSTR lpInputString, LPSTR lpszOutputString, int nOutStringLen)
static VOID
WINAPI
-ANSIToUnicode(LPSTR lpInputString, LPTSTR lpszOutputString, int nOutStringLen)
+ANSIToUnicode(LPCSTR lpInputString, LPWSTR lpszOutputString, int nOutStringLen)
{
CPINFO CodePageInfo;
- lstrcpy(lpszOutputString, (LPTSTR) lpInputString);
-
GetCPInfo(CP_ACP, &CodePageInfo);
- if (CodePageInfo.MaxCharSize > 1 || ((LPBYTE) lpInputString)[1] != '\0')
- {
- // Looks like ANSI or MultiByte, better translate it
- MultiByteToWideChar(CP_ACP, 0, (LPCSTR) lpInputString, -1,
- (LPWSTR) lpszOutputString, nOutStringLen);
- }
- else
- lstrcpy(lpszOutputString, (LPTSTR) lpInputString);
+ MultiByteToWideChar(CP_ACP, 0, lpInputString, -1,
+ lpszOutputString, nOutStringLen);
} // ANSIToUnicode
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
