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

Merge branch 'gt68xx/proper_free' into 'master' 

gt68xx: fix use-after-free and two mem leaks

See merge request sane-project/backends!634
merge-requests/632/merge
Wolfram Sang 2021-06-18 22:00:16 +00:00
rodzic 026430c293 63942f7a74
commit 1a95dc7cde
1 zmienionych plików z 15 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
backend/gt68xx.c
Wyświetl plik

@ -1174,8 +1174,11 @@ static SANE_Status probe_gt68xx_devices(void)
new_dev[i]->model->firmware_name); new_dev[i]->model->firmware_name);
} }
if (i == 0) if (i == 0)
DBG (5, "sane_init: firmware %s can't be loaded, set device " {
"first\n", word); DBG (5, "sane_init: firmware %s can't be loaded, set device "
"first\n", word);
free (word);
}
} }
else else
{ {
@ -1198,8 +1201,11 @@ static SANE_Status probe_gt68xx_devices(void)
new_dev[i]->model->name, new_dev[i]->model->vendor); new_dev[i]->model->name, new_dev[i]->model->vendor);
} }
if (i == 0) if (i == 0)
DBG (5, "sane_init: can't set vendor name %s, set device " {
"first\n", word); DBG (5, "sane_init: can't set vendor name %s, set device "
"first\n", word);
free (word);
}
} }
else else
{ {
@ -1221,9 +1227,11 @@ static SANE_Status probe_gt68xx_devices(void)
new_dev[i]->model->name, new_dev[i]->model->model); new_dev[i]->model->name, new_dev[i]->model->model);
} }
if (i == 0) if (i == 0)
DBG (5, "sane_init: can't set model name %s, set device " {
"first\n", word); DBG (5, "sane_init: can't set model name %s, set device "
free (word); "first\n", word);
free (word);
}
} }
else else
{ {