Changeset 3378 for trunk/src

Timestamp:

Jun 11, 2020, 11:26:51 PM (5 years ago)

Author:

bird

Message:

kWorker: Set g_Sandbox.pTool to NULL when creating (looking up) the tool for the next job, otherwise the innermost SetDllDirectoryW hack will pick up the directory of the previous tool and we won't necessarily find all the DLLs.

File:

• trunk/src/kWorker/kWorker.c (modified) (2 diffs)

trunk/src/kWorker/kWorker.c

@@ -2988 +2988 @@
                                         continue;
                                 }
-                                kwErrPrintf("Error getting import '%s' for '%s': %d\n", szName, pMod->pszPath);
+                                kwErrPrintf("Error getting import '%s' for '%s': %d (%u)\n",
+                                            szName, pMod->pszPath, rc, GetLastError());
                                 break;
                             }
@@ -12352 +12353 @@
      * Lookup the tool.
      */
+    g_Sandbox.pTool = NULL; /* Avoid confusion between the SetDllDirectoryW hacks. */
     pTool = kwToolLookup(pszExecutable, cEnvVars, papszEnvVars);
     if (pTool)