Index: modules/highgui/src/cap_libv4l.cpp
===================================================================
--- modules/highgui/src/cap_libv4l.cpp	(revision 7044)
+++ modules/highgui/src/cap_libv4l.cpp	(working copy)
@@ -821,8 +821,13 @@
 
 #ifdef USE_TEMP_BUFFER
        if (n_buffers == 0) {
-	 capture->buffers[MAX_V4L_BUFFERS].start = malloc(buf.length);
-	 capture->buffers[MAX_V4L_BUFFERS].length = buf.length;
+           if (capture->buffers[MAX_V4L_BUFFERS].start) {
+               free(capture->buffers[MAX_V4L_BUFFERS].start);
+               capture->buffers[MAX_V4L_BUFFERS].start = NULL;
+		   }
+		
+           capture->buffers[MAX_V4L_BUFFERS].start = malloc(buf.length);
+           capture->buffers[MAX_V4L_BUFFERS].length = buf.length;
        };
 #endif
    }
@@ -1006,6 +1011,10 @@
    capture->width  = DEFAULT_V4L_WIDTH;
    capture->height = DEFAULT_V4L_HEIGHT;
 
+#ifdef USE_TEMP_BUFFER
+   capture->buffers[MAX_V4L_BUFFERS].start = NULL;
+#endif
+
    /* Select camera, or rather, V4L video source */
    if (index<0) { // Asking for the first device available
      for (; autoindex<MAX_CAMERAS;autoindex++)
@@ -1184,7 +1193,6 @@
 
       }
 
-
       /* preparation is ok */
       capture->FirstCapture = 0;
    }
@@ -1694,6 +1702,13 @@
      if (capture->frame.imageData)
        cvFree(&capture->frame.imageData);
 
+#ifdef USE_TEMP_BUFFER
+     if (capture->buffers[MAX_V4L_BUFFERS].start) {
+       free(capture->buffers[MAX_V4L_BUFFERS].start);
+       capture->buffers[MAX_V4L_BUFFERS].start = NULL;
+     }
+#endif
+
      //v4l2_free_ranges(capture);
      //cvFree((void **)capture);
    }