branch update for HEAD-2003091401

[reactos.git] / lib / ws2_32 / misc / catalog.c

diff --git a/lib/ws2_32/misc/catalog.c b/lib/ws2_32/misc/catalog.c
index ef077be..29e6cdc 100644 (file)
--- a/lib/ws2_32/misc/catalog.c
+++ b/lib/ws2_32/misc/catalog.c
@@ -191,9 +191,14 @@ INT LoadProvider(
   WS_DbgPrint(MAX_TRACE, ("Loading provider at (0x%X)  Name (%wZ).\n",
     Provider, &Provider->LibraryName));
 
-  if (Provider->hModule == INVALID_HANDLE_VALUE) {
-    /* DLL is not loaded so load it now */
-    Provider->hModule = LoadLibrary(Provider->LibraryName.Buffer);
+  if (Provider->hModule == INVALID_HANDLE_VALUE)
+  {
+    /* DLL is not loaded so load it now
+     * UNICODE_STRING objects are not null-terminated, but LoadLibraryW
+     * expects a null-terminated string
+     */
+    Provider->LibraryName.Buffer[Provider->LibraryName.Length] = L'\0';
+    Provider->hModule = LoadLibraryW(Provider->LibraryName.Buffer);
     if (Provider->hModule != INVALID_HANDLE_VALUE) {
       Provider->WSPStartup = (LPWSPSTARTUP)GetProcAddress(
         Provider->hModule,