diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-05-11 11:36:19 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2012-07-23 15:38:40 -0400 |
| commit | 19b38c274bbf5bb2e566b434e14915ea2b141374 (patch) | |
| tree | 2638aeb6c006cb61f1d2c5bf171f3569f8ccc922 /src/lib | |
| parent | 6f6dc3a55e345118bb06c1aee0a899db8e68abff (diff) | |
| download | krb5-19b38c274bbf5bb2e566b434e14915ea2b141374.zip krb5-19b38c274bbf5bb2e566b434e14915ea2b141374.tar.gz krb5-19b38c274bbf5bb2e566b434e14915ea2b141374.tar.bz2 | |
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
Diffstat (limited to 'src/lib')
| -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 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 |