If saned does not find any config file, it calls fclose with a NULL FILE*. The

code may also leak open file descriptors and FILE's if multiple config files are
found. (bug #303339). Fixed possible segfault on close_handle() (bug #303338).
merge-requests/1/head
Henning Geinitz 2006-04-09 10:07:18 +00:00
rodzic db4e34ab62
commit de2c4fb484
2 zmienionych plików z 12 dodań i 3 usunięć

Wyświetl plik

@ -1,3 +1,10 @@
2006-04-09 Henning Meier-Geinitz <henning@meier-geinitz.de>
* frontend/saned.c: If saned does not find any config file, it
calls fclose with a NULL FILE*. The code may also leak open file
descriptors and FILE's if multiple config files are found. (bug
#303339). Fixed possible segfault on close_handle() (bug #303338).
2006-04-03 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions-external/brother2.desc: Added several scanners

Wyświetl plik

@ -447,8 +447,10 @@ static void
close_handle (int h)
{
if (h >= 0 && handle[h].inuse)
sane_close (handle[h].handle);
handle[h].inuse = 0;
{
sane_close (handle[h].handle);
handle[h].inuse = 0;
}
}
static SANE_Word
@ -1035,9 +1037,9 @@ check_host (int fd)
}
}
}
fclose (fp);
}
fclose (fp);
if (access_ok)
return SANE_STATUS_GOOD;