diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-05-11 11:36:19 -0400 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2012-07-16 09:31:15 -0400 |
| commit | 7acb524f5aa00274771dbbfac19d2dd779aad409 (patch) | |
| tree | 2f80b2add6aa7283a41b9bc306a93106ee109169 /src | |
| parent | c8cd6bd75776de265e34bc2dae9b3fd234759126 (diff) | |
| download | krb5-7acb524f5aa00274771dbbfac19d2dd779aad409.tar.gz krb5-7acb524f5aa00274771dbbfac19d2dd779aad409.tar.xz krb5-7acb524f5aa00274771dbbfac19d2dd779aad409.zip | |
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>
ticket: 7212 (new)
tags: pullup
Diffstat (limited to 'src')
| -rw-r--r-- | 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 098ba29c6b..3d579d6e8e 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 |