diff options
| author | Bruno Haible <bruno@clisp.org> | 2021-08-08 19:11:31 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2021-08-08 19:11:31 +0200 |
| commit | 51dd05503668d47c0f5b37a9b481d4e3d7463586 (patch) | |
| tree | 000b10ca6c549d7511646055708a6b952b556d2a | |
| parent | 1cb09be022ba08d3794fbff6e0e49816c9a4056e (diff) | |
| download | gnulib-51dd05503668d47c0f5b37a9b481d4e3d7463586.tar.gz | |
relocatable-lib-lgpl: Fix a memory leak related to a Windows DLL.
Reported by Jonathan Boeing <jonathan@claws-mail.org> in
<https://lists.gnu.org/archive/html/bug-gnulib/2021-08/msg00048.html>.
* lib/relocatable.c (DllMain): Avoid memory leak in a special case
of repeated attach/detach.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/relocatable.c | 13 |
2 files changed, 19 insertions, 2 deletions
@@ -1,5 +1,13 @@ 2021-08-08 Bruno Haible <bruno@clisp.org> + relocatable-lib-lgpl: Fix a memory leak related to a Windows DLL. + Reported by Jonathan Boeing <jonathan@claws-mail.org> in + <https://lists.gnu.org/archive/html/bug-gnulib/2021-08/msg00048.html>. + * lib/relocatable.c (DllMain): Avoid memory leak in a special case + of repeated attach/detach. + +2021-08-08 Bruno Haible <bruno@clisp.org> + fopen: Fix link error on native Windows. * modules/fopen (Depends-on): Add close. diff --git a/lib/relocatable.c b/lib/relocatable.c index ababc35011..a6829127b4 100644 --- a/lib/relocatable.c +++ b/lib/relocatable.c @@ -323,7 +323,10 @@ static char *shared_library_fullname; supports longer file names (see <https://cygwin.com/ml/cygwin/2011-01/msg00410.html>). */ -/* Determine the full pathname of the shared library when it is loaded. */ +/* Determine the full pathname of the shared library when it is loaded. + + Documentation: + <https://docs.microsoft.com/en-us/windows/win32/dlls/dllmain> */ BOOL WINAPI DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved) @@ -343,7 +346,13 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved) /* Shouldn't happen. */ return FALSE; - shared_library_fullname = strdup (location); + /* Avoid a memory leak when the same DLL get attached, detached, + attached, detached, and so on. This happens e.g. when a spell + checker DLL is used repeatedly by a mail program. */ + if (!(shared_library_fullname != NULL + && strcmp (shared_library_fullname, location) == 0)) + /* Remember the full pathname of the shared library. */ + shared_library_fullname = strdup (location); } return TRUE; |