wine-commits September 2010

wine-commits@winehq.org

2 participants
852 discussions

Gerald Pfeifer : user32: Fix error handling in BITMAP_Load.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 824ab969ff1c5e0e3706d37855f4652244e295d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=824ab969ff1c5e0e3706d3785… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 16:10:39 2010 +0200 user32: Fix error handling in BITMAP_Load. --- dlls/user32/cursoricon.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 938f0dd..acae302 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -366,7 +366,7 @@ static BOOL is_dib_monochrome( const BITMAPINFO* info ) * DIB_GetBitmapInfo * * Get the info from a bitmap header. - * Return 1 for INFOHEADER, 0 for COREHEADER, + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 in case of failure. */ static int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *bpp, DWORD *compr ) @@ -2257,6 +2257,12 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, memcpy(scaled_info, fix_info, size); bm_type = DIB_GetBitmapInfo( &fix_info->bmiHeader, &width, &height, &bpp_dummy, &compr_dummy); + if (bm_type == -1) + { + WARN("Invalid bitmap format!\n"); + goto end_close; + } + if(desiredx != 0) new_width = desiredx; else

1 0

Gerald Pfeifer : setupx.dll16: Simplify VcpClose16 a bit.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: ae0a15477cf7abfd7df99564395b8399fadb500b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0a15477cf7abfd7df995643… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 00:17:21 2010 +0200 setupx.dll16: Simplify VcpClose16 a bit. --- dlls/setupx.dll16/virtcopy.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index 3fb94ec..299041f 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -484,7 +484,6 @@ static RETERR16 VCP_CopyFiles(void) RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) { RETERR16 res = OK; - WORD cbres = VCPN_PROCEED; TRACE("(%04x, '%s')\n", fl, lpszBackupDest); @@ -495,7 +494,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) memset(&vcp_status, 0, sizeof(VCPSTATUS)); /* yes, vcp_status.cbSize is 0 ! */ TRACE("#2\n"); - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSESTART, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCLOSESTART, 0, 0, VCP_MsgRef); TRACE("#3\n"); res = VCP_CheckPaths(); @@ -505,7 +504,7 @@ RETERR16 WINAPI VcpClose16(WORD fl, LPCSTR lpszBackupDest) VCP_CopyFiles(); TRACE("#5\n"); - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCLOSEEND, 0, 0, VCP_MsgRef); TRACE("#6\n"); VCP_Proc = NULL; VCP_opened = FALSE;

1 0

Gerald Pfeifer : setupx.dll16: Fix error handling in VCP_VirtnodeCreate.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 7c27f9cbac03231807cace32f9e52a741c7ee17c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c27f9cbac03231807cace32f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 15:41:43 2010 +0200 setupx.dll16: Fix error handling in VCP_VirtnodeCreate. --- dlls/setupx.dll16/virtcopy.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index b80a5be..3fb94ec 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -211,7 +211,6 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC { HANDLE heap; LPVIRTNODE lpvn; - RETERR16 cbres; while (vn_last < vn_num) { @@ -248,9 +247,9 @@ static RETERR16 VCP_VirtnodeCreate(const VCPFILESPEC *vfsSrc, const VCPFILESPEC lpvn->vhstrDstFinalName = 0xffff; /* FIXME: what is this ? */ - cbres = VCP_Callback(lpvn, VCPM_NODECREATE, 0, 0, VCP_MsgRef); + VCP_Callback(lpvn, VCPM_NODECREATE, 0, 0, VCP_MsgRef); lpvn->fl |= VFNL_CREATED; - cbres = VCP_Callback(lpvn, VCPM_NODEACCEPT, 0, 0, VCP_MsgRef); + VCP_Callback(lpvn, VCPM_NODEACCEPT, 0, 0, VCP_MsgRef); return OK; }

1 0

Gerald Pfeifer : winedbg: Fix the check for GCC version number around db_printf format checking.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 0991954c7f917ec652ad895e48e3234639255c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0991954c7f917ec652ad895e4… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 11:22:37 2010 +0200 winedbg: Fix the check for GCC version number around db_printf format checking. --- programs/winedbg/db_disasm64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 7cf1394..fe6a538 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -32,7 +32,7 @@ #include <stdio.h> #include "debugger.h" -#if defined(__GNUC__) && (GCC_VERSION >= 30000) +#if defined(__GNUC__) && (__GNUC__ >= 3) static int (*db_printf)(const char* format, ...) __attribute__((format (printf,1,2))); #else static int (*db_printf)(const char* format, ...);

1 0

Luca Bennati : kernel32: Remove dead assignments.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 9941f846e88391e5fd904b3afb45be0523c45da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9941f846e88391e5fd904b3af… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Sep 18 15:26:05 2010 +0200 kernel32: Remove dead assignments. --- dlls/kernel32/console.c | 2 +- dlls/kernel32/module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index aa7f105..064cd53 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2276,7 +2276,7 @@ static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, * happen if we're asked to overwrite more than twice the part of the line, * which is unlikely */ - for (blk = done = 0; done < len; done += blk) + for (done = 0; done < len; done += blk) { blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 4dded4e..07957c9 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -864,7 +864,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) ULONG magic; LdrLockLoaderLock( 0, NULL, &magic ); - if (!(nts = LdrGetDllHandle( load_path, flags, libname, &hModule ))) + if (!LdrGetDllHandle( load_path, flags, libname, &hModule )) { LdrAddRefDll( 0, hModule ); LdrUnlockLoaderLock( 0, magic );

1 0

Paul Vriens : atl/tests: Fix a test failure on Win95.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 507b29a046a1741c408146971c40765b5b363684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507b29a046a1741c408146971… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 19 17:18:25 2010 +0200 atl/tests: Fix a test failure on Win95. --- dlls/atl/tests/module.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 1b21f6e..2a97ef9 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -91,10 +91,14 @@ static void test_StructSize(void) ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); break; default: - ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + ok (FAILED(hres) || + broken((i > FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer )) && (hres == S_OK)), /* Win95 */ + "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); break; } } + + HeapFree (GetProcessHeap(), 0, tst); } START_TEST(module)

1 0

Thomas Mullaly : urlmon: Implemented validation for the userinfo component when create an IUri with IUriBuilder .
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: e48b81036aa36e91458e68745608de48650e8b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48b81036aa36e91458e68745… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 18 17:10:33 2010 -0400 urlmon: Implemented validation for the userinfo component when create an IUri with IUriBuilder. --- dlls/urlmon/tests/uri.c | 84 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 108 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 185 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 617486f..3bbb578 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5124,6 +5124,90 @@ static const uri_builder_test uri_builder_tests[] = { 0,INET_E_INVALID_URL,FALSE, 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE + }, + /* UserName can't contain any character that is a delimeter for another + * component that appears after it in a normal URI. + */ + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user:pass",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user(a)google.com",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user/path",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user?Query",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"user#Frag",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"pass(a)google.com",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"pass/path",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"pass?query",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"pass#frag",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index f46cbfb..eaf8c83 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -26,7 +26,9 @@ #define UINT_MAX 0xffffffff #define USHORT_MAX 0xffff -#define ALLOW_NULL_TERM_SCHEME 0x1 +#define ALLOW_NULL_TERM_SCHEME 0x1 +#define ALLOW_NULL_TERM_USER_NAME 0x2 +#define ALLOW_NULL_TERM_PASSWORD 0x4 WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -1281,7 +1283,7 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD return TRUE; } -static BOOL parse_username(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_username(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { data->username = *ptr; while(**ptr != ':' && **ptr != '@') { @@ -1294,7 +1296,9 @@ static BOOL parse_username(const WCHAR **ptr, parse_data *data, DWORD flags) { } } else continue; - } else if(is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { + } else if(extras & ALLOW_NULL_TERM_USER_NAME && !**ptr) + break; + else if(is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { *ptr = data->username; data->username = NULL; return FALSE; @@ -1307,7 +1311,7 @@ static BOOL parse_username(const WCHAR **ptr, parse_data *data, DWORD flags) { return TRUE; } -static BOOL parse_password(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_password(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { const WCHAR *start = *ptr; if(**ptr != ':') @@ -1326,7 +1330,9 @@ static BOOL parse_password(const WCHAR **ptr, parse_data *data, DWORD flags) { } } else continue; - } else if(is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { + } else if(extras & ALLOW_NULL_TERM_PASSWORD && !**ptr) + break; + else if(is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { *ptr = start; data->password = NULL; return FALSE; @@ -1361,12 +1367,12 @@ static BOOL parse_password(const WCHAR **ptr, parse_data *data, DWORD flags) { static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { const WCHAR *start = *ptr; - if(!parse_username(ptr, data, flags)) { + if(!parse_username(ptr, data, flags, 0)) { TRACE("(%p %p %x): URI contained no userinfo.\n", ptr, data, flags); return; } - if(!parse_password(ptr, data, flags)) { + if(!parse_password(ptr, data, flags, 0)) { *ptr = start; data->username = NULL; data->username_len = 0; @@ -3561,6 +3567,90 @@ static HRESULT validate_scheme_name(const UriBuilder *builder, parse_data *data, return S_OK; } +static HRESULT validate_username(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->username) { + ptr = builder->username; + expected_len = builder->username_len; + } else if(!(builder->modified_props & Uri_HAS_USER_NAME) && builder->uri && + builder->uri->userinfo_start > -1 && builder->uri->userinfo_split != 0) { + /* Just use the username from the base Uri. */ + data->username = builder->uri->canon_uri+builder->uri->userinfo_start; + data->username_len = (builder->uri->userinfo_split > -1) ? + builder->uri->userinfo_split : builder->uri->userinfo_len; + ptr = NULL; + } else { + ptr = NULL; + expected_len = 0; + } + + if(ptr) { + pptr = &ptr; + if(parse_username(pptr, data, flags, ALLOW_NULL_TERM_USER_NAME) && + data->username_len == expected_len) + TRACE("(%p %p %x): Found valid username component %s.\n", builder, data, flags, + debugstr_wn(data->username, data->username_len)); + else { + TRACE("(%p %p %x): Invalid username component found %s.\n", builder, data, flags, + debugstr_wn(ptr, expected_len)); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + +static HRESULT validate_password(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->password) { + ptr = builder->password; + expected_len = builder->password_len; + } else if(!(builder->modified_props & Uri_HAS_PASSWORD) && builder->uri && + builder->uri->userinfo_split > -1) { + data->password = builder->uri->canon_uri+builder->uri->userinfo_start+builder->uri->userinfo_split+1; + data->password_len = builder->uri->userinfo_len-builder->uri->userinfo_split-1; + ptr = NULL; + } else { + ptr = NULL; + expected_len = 0; + } + + if(ptr) { + pptr = &ptr; + if(parse_password(pptr, data, flags, ALLOW_NULL_TERM_PASSWORD) && + data->password_len == expected_len) + TRACE("(%p %p %x): Found valid password component %s.\n", builder, data, flags, + debugstr_wn(data->password, data->password_len)); + else { + TRACE("(%p %p %x): Invalid password component found %s.\n", builder, data, flags, + debugstr_wn(ptr, expected_len)); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + +static HRESULT validate_userinfo(const UriBuilder *builder, parse_data *data, DWORD flags) { + HRESULT hr; + + hr = validate_username(builder, data, flags); + if(FAILED(hr)) + return hr; + + hr = validate_password(builder, data, flags); + if(FAILED(hr)) + return hr; + + return S_OK; +} + static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { HRESULT hr; @@ -3582,6 +3672,10 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, } } + hr = validate_userinfo(builder, data, flags); + if(FAILED(hr)) + return hr; + return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon: Restructured how the userinfo component is parsed and canonicalized.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: fcc9d609b008230cdee7129e620df24cf408f446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc9d609b008230cdee7129e6… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Sep 12 19:11:10 2010 -0400 urlmon: Restructured how the userinfo component is parsed and canonicalized. --- dlls/urlmon/uri.c | 244 +++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 182 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc9d609b008230cdee71…

1 0

Thomas Mullaly : urlmon: File URIs can' t have a userinfo component when creating an IUri using IUriBuilder.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: e767cc813dcb3ade73575105d5ee3b2c5d7028d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e767cc813dcb3ade73575105d… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 18 16:57:29 2010 -0400 urlmon: File URIs can't have a userinfo component when creating an IUri using IUriBuilder. --- dlls/urlmon/tests/uri.c | 20 ++++++++++++++++++++ dlls/urlmon/uri.c | 10 ++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 6830832..617486f 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5104,6 +5104,26 @@ static const uri_builder_test uri_builder_tests[] = { 0,INET_E_INVALID_URL,FALSE, 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE + }, + /* File scheme's can't have a username set. */ + { "file://google.com/",0,S_OK,FALSE, + { + {TRUE,"username",NULL,Uri_PROPERTY_USER_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + /* File schemes can't have a password set. */ + { "file://google.com/",0,S_OK,FALSE, + { + {TRUE,"password",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index bab021b..335017c 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3452,6 +3452,16 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, if(FAILED(hr)) return hr; + /* Extra validation for file schemes. */ + if(data->scheme_type == URL_SCHEME_FILE) { + if((builder->password || (builder->uri && builder->uri->userinfo_split > -1)) || + (builder->username || (builder->uri && builder->uri->userinfo_start > -1))) { + TRACE("(%p %p %x): File schemes can't contain a username or password.\n", + builder, data, flags); + return INET_E_INVALID_URL; + } + } + return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon: Implemented validation of scheme component of a IUriBuilder.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: f2a1737e35e7fd46c5a960360bb475d71b1989f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a1737e35e7fd46c5a960360… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 18 15:19:55 2010 -0400 urlmon: Implemented validation of scheme component of a IUriBuilder. --- dlls/urlmon/tests/uri.c | 19 +++++++++++++ dlls/urlmon/uri.c | 69 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 9ef36aa..6830832 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5085,6 +5085,25 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { NULL,0,S_OK,FALSE, + { + {TRUE,"/test/test/",NULL,Uri_PROPERTY_PATH,S_OK,FALSE}, + {TRUE,"#Fr<|>g",NULL,Uri_PROPERTY_FRAGMENT,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"ht%xxtp",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e4a7401..bab021b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -26,6 +26,8 @@ #define UINT_MAX 0xffffffff #define USHORT_MAX 0xffff +#define ALLOW_NULL_TERM_SCHEME 0x1 + WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x20,0x0c,0x9a,0x66}}; @@ -1148,7 +1150,7 @@ static BOOL check_ipv4address(const WCHAR **ptr, BOOL strict) { * scheme = ALPHA *(ALPHA | NUM | '+' | '-' | '.') as defined by RFC 3896. * NOTE: Windows accepts a number as the first character of a scheme. */ -static BOOL parse_scheme_name(const WCHAR **ptr, parse_data *data) { +static BOOL parse_scheme_name(const WCHAR **ptr, parse_data *data, DWORD extras) { const WCHAR *start = *ptr; data->scheme = NULL; @@ -1172,7 +1174,7 @@ static BOOL parse_scheme_name(const WCHAR **ptr, parse_data *data) { return FALSE; /* Schemes must end with a ':' */ - if(**ptr != ':') { + if(**ptr != ':' && !((extras & ALLOW_NULL_TERM_SCHEME) && !**ptr)) { *ptr = start; return FALSE; } @@ -1225,7 +1227,7 @@ static BOOL parse_scheme_type(parse_data *data) { * * Returns TRUE if it was able to successfully parse the information. */ -static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { +static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { static const WCHAR fileW[] = {'f','i','l','e',0}; static const WCHAR wildcardW[] = {'*',0}; @@ -1245,7 +1247,7 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { ptr, data, flags); return FALSE; } - } else if(!parse_scheme_name(ptr, data)) { + } else if(!parse_scheme_name(ptr, data, extras)) { /* No Scheme was found, this means it could be: * a) an implicit Wildcard scheme * b) a relative URI @@ -2091,7 +2093,7 @@ static BOOL parse_uri(parse_data *data, DWORD flags) { TRACE("(%p %x): BEGINNING TO PARSE URI %s.\n", data, flags, debugstr_w(data->uri)); - if(!parse_scheme(pptr, data, flags)) + if(!parse_scheme(pptr, data, flags, 0)) return FALSE; if(!parse_hierpart(pptr, data, flags)) @@ -3407,9 +3409,58 @@ static void reset_builder(UriBuilder *builder) { builder->modified_props = 0; } +static HRESULT validate_scheme_name(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->scheme) { + ptr = builder->scheme; + expected_len = builder->scheme_len; + } else if(builder->uri && builder->uri->scheme_start > -1) { + ptr = builder->uri->canon_uri+builder->uri->scheme_start; + expected_len = builder->uri->scheme_len; + } else { + static const WCHAR nullW[] = {0}; + ptr = nullW; + expected_len = 0; + } + + pptr = &ptr; + if(parse_scheme(pptr, data, flags, ALLOW_NULL_TERM_SCHEME) && + data->scheme_len == expected_len) { + if(data->scheme) + TRACE("(%p %p %x): Found valid scheme component %s.\n", builder, data, flags, + debugstr_wn(data->scheme, data->scheme_len)); + } else { + TRACE("(%p %p %x): Invalid scheme component found %s.\n", builder, data, flags, + debugstr_wn(ptr, expected_len)); + return INET_E_INVALID_URL; + } + + return S_OK; +} + +static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { + HRESULT hr; + + memset(data, 0, sizeof(parse_data)); + + TRACE("(%p %p %x): Beginning to validate builder components.\n", builder, data, flags); + + hr = validate_scheme_name(builder, data, flags); + if(FAILED(hr)) + return hr; + + return E_NOTIMPL; +} + static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_flags, DWORD use_orig_flags, DWORD encoding_mask) { + HRESULT hr; + parse_data data; + if(!uri) return E_POINTER; @@ -3438,7 +3489,13 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla return S_OK; } - return E_NOTIMPL; + hr = validate_components(builder, &data, create_flags); + if(FAILED(hr)) { + *uri = NULL; + return hr; + } + + return S_OK; } #define URI_THIS(iface) DEFINE_THIS(Uri, IUri, iface)

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2010