mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

dll: fix memory leak in load 

In the case where we are unable to get a path for loading libs, and
instead just use LIBDIR, we set 'src = strdup(LIBDIR)'. However, we
never update orig_src to point to src before tokenizing the path with
strsep(), so the memory is never freed.

Update load to always set orig_src to src so that we don't leak memory.
merge-requests/540/head
Fletcher Woodruff 2020-10-12 16:22:40 -06:00
rodzic 9ac6ee6cd6
commit de903b84c4
1 zmienionych plików z 1 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
backend/dll.c
Wyświetl plik

@ -477,9 +477,6 @@ load (struct backend *be)
DBG (1, "load: malloc failed: %s\n", strerror (errno)); DBG (1, "load: malloc failed: %s\n", strerror (errno));
return SANE_STATUS_NO_MEM; return SANE_STATUS_NO_MEM;
} }
if (orig_src)
free (orig_src);
orig_src = src;
snprintf (src, src_len, "%s%s%s", path, DIR_SEP, LIBDIR); snprintf (src, src_len, "%s%s%s", path, DIR_SEP, LIBDIR);
} }
else else
@ -494,6 +491,7 @@ load (struct backend *be)
} }
DBG (3, "load: searching backend `%s' in `%s'\n", be->name, src); DBG (3, "load: searching backend `%s' in `%s'\n", be->name, src);
orig_src = src;
dir = strsep (&src, DIR_SEP); dir = strsep (&src, DIR_SEP);
while (dir) while (dir)