July 2023 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Fix nsparser leak if script_elem_from_nsscript failed.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 5233c1a6a997e87047d8dba7278bd0841e26281b URL: https://gitlab.winehq.org/wine/wine/-/commit/5233c1a6a997e87047d8dba7278bd0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:58 2023 +0200 mshtml: Fix nsparser leak if script_elem_from_nsscript failed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 541257b0a20440a8f1e6e7376fc8593d08b3f32a) --- dlls/mshtml/mutation.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index e308c1af31b..f29f9e50226 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -343,8 +343,11 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa hres = script_elem_from_nsscript(nsscript, &script_elem); nsIDOMHTMLScriptElement_Release(nsscript); - if(FAILED(hres)) + if(FAILED(hres)) { + if(nsparser) + nsIParser_Release(nsparser); return NS_ERROR_FAILURE; + } if(nsparser) { nsIParser_BeginEvaluatingParserInsertedScript(nsparser);

1 0

Brendan Shanks : winemac: Fix memory leak in UpdateDisplayDevices.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 37dc69fee4641f4994946b4a68a2128679fa4ba5 URL: https://gitlab.winehq.org/wine/wine/-/commit/37dc69fee4641f4994946b4a68a212… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 21 14:42:30 2023 -0700 winemac: Fix memory leak in UpdateDisplayDevices. (cherry picked from commit 644c54b1036dec4266e723319a362070f8e3ba8f) --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index dab81cc8ffb..f3eeebf3ce0 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1211,6 +1211,7 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage device_manager->add_mode( mode, param ); } + free(modes); macdrv_free_monitors(monitors); }

1 0

Gabriel Ivăncescu : mshtml: Fix factory leak in init_nsio.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 072073db040a1591119b2682d0a5e144954e390d URL: https://gitlab.winehq.org/wine/wine/-/commit/072073db040a1591119b2682d0a5e1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Fix factory leak in init_nsio. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit eba8c8d66e25e232953050e395ec1b71079bf9d6) --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 612d91ed386..f4778ca00f9 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3994,9 +3994,9 @@ void init_nsio(nsIComponentManager *component_manager) } nsres = nsIFactory_CreateInstance(old_factory, NULL, &IID_nsIIOService, (void**)&nsio); + nsIFactory_Release(old_factory); if(NS_FAILED(nsres)) { ERR("Couldn not create nsIOService instance %08lx\n", nsres); - nsIFactory_Release(old_factory); return; }

1 0

Gabriel Ivăncescu : mshtml: Fix nsIFile dir leak in init_xpcom.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 1252e27c55778486c70ede7c502d3387d1c89107 URL: https://gitlab.winehq.org/wine/wine/-/commit/1252e27c55778486c70ede7c502d33… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Fix nsIFile dir leak in init_xpcom. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit a10acc0ac398d5614ff731756c963c1416ed3255) --- dlls/mshtml/nsembed.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index b7518f55ef9..9873e21ca38 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -560,6 +560,7 @@ static BOOL init_xpcom(const PRUnichar *gre_path) } nsres = NS_InitXPCOM2(&pServMgr, gre_dir, (nsIDirectoryServiceProvider*)&nsDirectoryServiceProvider2); + nsIFile_Release(gre_dir); if(NS_FAILED(nsres)) { ERR("NS_InitXPCOM2 failed: %08lx\n", nsres); FreeLibrary(xul_handle);

1 0

Gabriel Ivăncescu : mshtml: Fix URI leak in NewURI on failure.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 223de5aeb7985ca274b66ac24073cdbad9cda5bd URL: https://gitlab.winehq.org/wine/wine/-/commit/223de5aeb7985ca274b66ac24073cd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Fix URI leak in NewURI on failure. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 1544be253a3e5f9a67a371ab33dfacd7c1dec2a4) --- dlls/mshtml/nsio.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f4778ca00f9..26b34da178e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3870,16 +3870,6 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC if(!strncmp(spec, "wine:", 5)) spec += 5; - if(aBaseURI) { - nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri); - if(NS_SUCCEEDED(nsres)) { - if(!ensure_uri(base_wine_uri)) - return NS_ERROR_UNEXPECTED; - }else { - WARN("Could not get base nsWineURI: %08lx\n", nsres); - } - } - if(aOriginCharset && *aOriginCharset && _strnicmp(aOriginCharset, "utf", 3)) { BSTR charset; int len; @@ -3897,8 +3887,21 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC MultiByteToWideChar(cp, 0, spec, -1, new_spec, ARRAY_SIZE(new_spec)); + if(aBaseURI) { + nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri); + if(NS_SUCCEEDED(nsres)) { + if(!ensure_uri(base_wine_uri)) { + nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); + return NS_ERROR_UNEXPECTED; + } + }else { + WARN("Could not get base nsWineURI: %08lx\n", nsres); + } + } + if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri); + nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); }else { hres = create_uri(new_spec, 0, &urlmon_uri); if(FAILED(hres)) @@ -3910,8 +3913,6 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC nsres = create_nsuri(urlmon_uri, &wine_uri); IUri_Release(urlmon_uri); - if(base_wine_uri) - nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); if(NS_FAILED(nsres)) return nsres;

1 0

Gabriel Ivăncescu : mshtml: Store minimum compat mode required for events in the ctor table.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: bb0ed22e4486881cacedacdcb764683c2b8cc4eb URL: https://gitlab.winehq.org/wine/wine/-/commit/bb0ed22e4486881cacedacdcb76468… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Store minimum compat mode required for events in the ctor table. Since such event types don't exist as separate event types in older modes, this prevents confusing leaks without bloating the constructors with more boilerplate. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 917ec2db6658b87abb7bbdb257e72ee0e82dc7d5) --- dlls/mshtml/htmlevent.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index bccdfb81121..d8d39413648 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3100,9 +3100,6 @@ static DOMEvent *progress_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_ { DOMProgressEvent *progress_event; - if(compat_mode < COMPAT_MODE_IE10) - return event_ctor(sizeof(DOMEvent), &DOMEvent_dispex, NULL, NULL, nsevent, event_id, compat_mode); - if(!(progress_event = event_ctor(sizeof(DOMProgressEvent), &DOMProgressEvent_dispex, DOMProgressEvent_query_interface, DOMProgressEvent_destroy, nsevent, event_id, compat_mode))) return NULL; @@ -3132,6 +3129,7 @@ static DOMEvent *storage_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t static const struct { REFIID iid; DOMEvent *(*ctor)(void *iface, nsIDOMEvent *nsevent, eventid_t, compat_mode_t); + compat_mode_t min_compat_mode; } event_types_ctor_table[] = { [EVENT_TYPE_EVENT] = { NULL, generic_event_ctor }, [EVENT_TYPE_UIEVENT] = { &IID_nsIDOMUIEvent, ui_event_ctor }, @@ -3142,7 +3140,7 @@ static const struct { [EVENT_TYPE_DRAG] = { NULL, generic_event_ctor }, [EVENT_TYPE_PAGETRANSITION] = { NULL, page_transition_event_ctor }, [EVENT_TYPE_CUSTOM] = { &IID_nsIDOMCustomEvent, custom_event_ctor }, - [EVENT_TYPE_PROGRESS] = { &IID_nsIDOMProgressEvent, progress_event_ctor }, + [EVENT_TYPE_PROGRESS] = { &IID_nsIDOMProgressEvent, progress_event_ctor, COMPAT_MODE_IE10 }, [EVENT_TYPE_MESSAGE] = { NULL, message_event_ctor }, [EVENT_TYPE_STORAGE] = { NULL, storage_event_ctor }, }; @@ -3153,6 +3151,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev void *iface = NULL; DOMEvent *event; + if(compat_mode < event_types_ctor_table[event_type].min_compat_mode) + event_type = EVENT_TYPE_EVENT; + if(event_types_ctor_table[event_type].iid) nsIDOMEvent_QueryInterface(nsevent, event_types_ctor_table[event_type].iid, &iface);

1 0

Hans Leidekker : ws2_32: Skip non-address records in dns_only_query().
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: f206f787da22cd229a4d4eea19931cf7df743cac URL: https://gitlab.winehq.org/wine/wine/-/commit/f206f787da22cd229a4d4eea19931c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 12 15:17:10 2023 +0200 ws2_32: Skip non-address records in dns_only_query(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54819 (cherry picked from commit f512b3c08ccfc9b9c235964002e644e2cbd657cf) --- dlls/ws2_32/protocol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 1f840832c7a..f746257a4fc 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -96,8 +96,8 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc } } - for (ptr = rec; ptr; ptr = ptr->pNext) count++; - for (ptr = rec6; ptr; ptr = ptr->pNext) count++; + for (ptr = rec; ptr; ptr = ptr->pNext) { if (ptr->wType == DNS_TYPE_A) count++; }; + for (ptr = rec6; ptr; ptr = ptr->pNext) { if (ptr->wType == DNS_TYPE_AAAA) count++; }; if (!count) { DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); @@ -114,6 +114,7 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc for (ptr = rec; ptr; ptr = ptr->pNext) { + if (ptr->wType != DNS_TYPE_A) continue; info->ai_family = AF_INET; info->ai_socktype = hints->ai_socktype; info->ai_protocol = hints->ai_protocol; @@ -128,6 +129,7 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc } for (ptr = rec6; ptr; ptr = ptr->pNext) { + if (ptr->wType != DNS_TYPE_AAAA) continue; info->ai_family = AF_INET6; info->ai_socktype = hints->ai_socktype; info->ai_protocol = hints->ai_protocol;

1 0

Bernhard Übelacker : ntoskrnl: Do not leak memory by setting input buffer to NULL.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 4000f08c3295c3f587ad5da6ace1e6bd5939d050 URL: https://gitlab.winehq.org/wine/wine/-/commit/4000f08c3295c3f587ad5da6ace1e6… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Jan 11 22:15:26 2022 +0100 ntoskrnl: Do not leak memory by setting input buffer to NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52322 (cherry picked from commit 07c0cd6ba5f4b1d6ef738ad7f3cad9992947dd3d) --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cc30750a160..b5872cc57eb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -832,7 +832,6 @@ static NTSTATUS dispatch_volume( struct dispatch_context *context ) irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread(); irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; - context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ return dispatch_irp( device, irp, context );

1 0

Francois Gouget : wininet/tests: Dump the state string if it is not as expected.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 9bad60833aaf562adfd1fc322818ed3a723453c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bad60833aaf562adfd1fc322818ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 7 15:18:19 2023 +0200 wininet/tests: Dump the state string if it is not as expected. Also set up the buffer so dumping it is safe enough if the string is not null-terminated. And fix the failure messages since the tested value is the string length in characters, not the buffer size in bytes. (cherry picked from commit f0b9f257c486f4ba1d6f7a1f7469bc3ed0cbfd38) --- dlls/wininet/tests/internet.c | 47 ++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 04b7f1041f7..0b88c9bc81e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -29,6 +29,7 @@ #include "winerror.h" #include "winreg.h" #include "winnls.h" +#include "wchar.h" #include "wine/test.h" @@ -1685,21 +1686,24 @@ static void test_InternetGetConnectedStateExA(void) ok(flags, "Expected at least one flag set\n"); /* no space for complete string this time */ - buffer[0] = 0; + memset(buffer, 'z', sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz - 1 == strlen(buffer), "Expected %lu bytes, got %u\n", sz - 1, lstrlenA(buffer)); + ok(sz - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); - buffer[0] = 0; + memset(buffer, 'z', sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz / 2 - 1 == strlen(buffer), "Expected %lu bytes, got %u\n", sz / 2 - 1, lstrlenA(buffer)); + ok(sz / 2 - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz / 2 - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); - buffer[0] = 0; + memset(buffer, 'z', sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -1711,14 +1715,15 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenA(buffer)); + ok(strlen(buffer) == 1, "Expected len 1, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); + memset(buffer, 'z', sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = 0; flags = 0; - buffer[0] = 0xDE; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); } static void test_InternetGetConnectedStateExW(void) @@ -1791,27 +1796,30 @@ static void test_InternetGetConnectedStateExW(void) ok(flags, "Expected at least one flag set\n"); /* no space for complete string this time */ - buffer[0] = 0; + wmemset(buffer, 'z', ARRAY_SIZE(buffer) - 1); + buffer[ARRAY_SIZE(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); if (flags & INTERNET_CONNECTION_MODEM) - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); else - ok(sz - 1 == lstrlenW(buffer), "Expected %lu bytes, got %u\n", sz - 1, lstrlenW(buffer)); + ok(sz - 1 == lstrlenW(buffer), "Expected len %lu, got %u: %s\n", sz - 1, lstrlenW(buffer), wine_dbgstr_w(buffer)); - buffer[0] = 0; + wmemset(buffer, 'z', ARRAY_SIZE(buffer) - 1); + buffer[ARRAY_SIZE(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); if (flags & INTERNET_CONNECTION_MODEM) - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); else - ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %lu bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); + ok(sz / 2 - 1 == lstrlenW(buffer), "Expected len %lu, got %u: %s\n", sz / 2 - 1, lstrlenW(buffer), wine_dbgstr_w(buffer)); - buffer[0] = 0; + wmemset(buffer, 'z', ARRAY_SIZE(buffer) - 1); + buffer[ARRAY_SIZE(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -1824,16 +1832,17 @@ static void test_InternetGetConnectedStateExW(void) ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); if (flags & INTERNET_CONNECTION_MODEM) - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); else - ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); + ok(lstrlenW(buffer) == 1, "Expected len 1, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); - buffer[0] = 0xDEAD; + wmemset(buffer, 'z', ARRAY_SIZE(buffer) - 1); + buffer[ARRAY_SIZE(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); } static void test_format_message(HMODULE hdll)

1 0

Francois Gouget : wininet: InternetGetConnectedStateExA() must always null-terminate the state string.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: stable Commit: 430737f19acb84a92bd76a23c79551ed182991e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/430737f19acb84a92bd76a23c79551… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 7 15:23:40 2023 +0200 wininet: InternetGetConnectedStateExA() must always null-terminate the state string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54799 (cherry picked from commit 6fa67bc8d70368e33510cce5128e9e01b2fdce7c) --- dlls/wininet/internet.c | 4 ++++ dlls/wininet/tests/internet.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2926fbccf9b..093212936d5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1295,8 +1295,12 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio rc = InternetGetConnectedStateExW(lpdwStatus,lpwszConnectionName, dwNameLen, dwReserved); if (rc && lpwszConnectionName) + { WideCharToMultiByte(CP_ACP,0,lpwszConnectionName,-1,lpszConnectionName, dwNameLen, NULL, NULL); + /* Yes, blindly truncate double-byte characters */ + lpszConnectionName[dwNameLen - 1] = '\0'; + } free(lpwszConnectionName); return rc; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 0b88c9bc81e..87a2c7d03e8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1685,7 +1685,7 @@ static void test_InternetGetConnectedStateExA(void) ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - /* no space for complete string this time */ + /* no space for complete string this time, double-byte characters get truncated */ memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; flags = 0;

1 0