Rob Shearman : wininet: Fix HTTP_EncodeBasicAuth by passing an out buffer to the second set of character set conversion calls .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1ec14b0b25209875b3ef5b3598d40672114a583a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1ec14b0b25209875b3ef5b3598...

Author: Rob Shearman 
Date:   Tue Jan 16 14:44:54 2007 -0600

wininet: Fix HTTP_EncodeBasicAuth by passing an out buffer to the second set of character set conversion calls.

---

dlls/wininet/http.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index dd56560..fa2b82f 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -900,10 +900,10 @@ static LPWSTR HTTP_EncodeBasicAuth( LPCW
     char *in;
     LPWSTR out;
     static const WCHAR szBasic[] = {'B','a','s','i','c',' ',0};
+    int userlen = WideCharToMultiByte(CP_UTF8, 0, username, lstrlenW(username), NULL, 0, NULL, NULL);
+    int passlen = WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL);

-    len = WideCharToMultiByte(CP_UTF8, 0, username, lstrlenW(username), NULL, 0, NULL, NULL) +
-        1 + WideCharToMultiByte(CP_UTF8, 0, password, lstrlenW(password), NULL, 0, NULL, NULL);
-    in = HeapAlloc( GetProcessHeap(), 0, (len+1)*sizeof(CHAR) );
+    in = HeapAlloc( GetProcessHeap(), 0, userlen + 1 + passlen );
     if( !in )
         return NULL;

@@ -912,11 +912,11 @@ static LPWSTR HTTP_EncodeBasicAuth( LPCW
     out = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
     if( out )
     {
-        WideCharToMultiByte(CP_UTF8, 0, username, -1, NULL, 0, NULL, NULL);
-        strcat(in, ":");
-        WideCharToMultiByte(CP_UTF8, 0, password, -1, NULL, 0, NULL, NULL);
+        WideCharToMultiByte(CP_UTF8, 0, username, -1, in, userlen, NULL, NULL);
+        in[userlen] = ':';
+        WideCharToMultiByte(CP_UTF8, 0, password, -1, &in[userlen+1], passlen, NULL, NULL);
         lstrcpyW( out, szBasic );
-        HTTP_EncodeBase64( in, len, &out[strlenW(out)] );
+        HTTP_EncodeBase64( in, userlen + 1 + passlen, &out[strlenW(out)] );
     }
     HeapFree( GetProcessHeap(), 0, in );