Unmap mapped buffer in sane_cancel().

merge-requests/1/head
Julien BLACHE 2008-12-17 15:20:31 +00:00
rodzic 8a2b4538c1
commit 4930880e8f
2 zmienionych plików z 12 dodań i 3 usunięć

Wyświetl plik

@ -1,3 +1,6 @@
2008-12-17 Julien Blache <jb@jblache.org>
* backend/v4l.c: unmap mapped buffer in sane_cancel().
2008-12-15 Alex Belkin <abc@telekom.ru>
* AUTHORS, configure, configure.in, backend/Makefile.in,
backend/xerox_mfp.c, backend/xerox_mfp.h, doc/Makefile.in,

Wyświetl plik

@ -1080,9 +1080,15 @@ sane_cancel (SANE_Handle handle)
DBG (2, "sane_cancel\n");
/* ??? buffer isn't checked in sane_read? */
if ((buffer != 0) && (s->is_mmap == SANE_FALSE))
free (buffer);
buffer = 0;
if (buffer)
{
if (s->is_mmap)
munmap (buffer, s->mbuf.size);
else
free (buffer);
buffer = NULL;
}
}