Index: CHANGELOG =================================================================== --- CHANGELOG (revisión: 446) +++ CHANGELOG (copia de trabajo) @@ -16,6 +16,8 @@ * Fix rotate for v4l2 devices using JPEG / MJPEG palettes. (Angel Carpintero) * Fix v4l2_palette http://www.lavrsen.dk/twiki/bin/view/Motion/UvcvideoMjpegPatch (Gerrit Hannaert) * Fix warning for x86_64 in conf.c using pointers LP64 compliant ( Angel Carpintero ). + * Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too) ( Peter Holik ) + http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2009x06x17x090603 3.2.10.1 Summary of Changes Index: CREDITS =================================================================== --- CREDITS (revisión: 446) +++ CREDITS (copia de trabajo) @@ -535,7 +535,10 @@ From mailing list 23 Dec 2005. * Avoid open file descriptor when connecting to network cameras fails http://www.lavrsen.dk/twiki/bin/view/Motion/AvoidOpenfiledescriptors + * Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too) + http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2009x06x17x090603 + Wesley Hosking * For pointing me to the absence of a frame length check using read for capturing Index: video_common.c =================================================================== --- video_common.c (revisión: 446) +++ video_common.c (copia de trabajo) @@ -597,8 +597,7 @@ } else { #endif close(dev->fd); - munmap(viddevs->v4l_buffers[0], viddevs->size_map); - munmap(viddevs->v4l_buffers[1], viddevs->size_map); + munmap(viddevs->v4l_buffers[0], dev->size_map); #ifdef MOTION_V4L2 } #endif