Commit fe988f56 authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab

V4L/DVB: gspca - main: Fix a crash in gspca_frame_add()

Some webcams as ov511 may find many times an end of image.
In this case, with the last patch in image concatenation
(commit 799b1bd41f398054d46fd35f73abd01c4009f6ca),
the image pointer was NULL and the system crashed in memcpy().
Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5fd8f738
...@@ -440,10 +440,15 @@ void gspca_frame_add(struct gspca_dev *gspca_dev, ...@@ -440,10 +440,15 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
frame->v4l2_buf.sequence = ++gspca_dev->sequence; frame->v4l2_buf.sequence = ++gspca_dev->sequence;
gspca_dev->image = frame->data; gspca_dev->image = frame->data;
gspca_dev->image_len = 0; gspca_dev->image_len = 0;
} else if (gspca_dev->last_packet_type == DISCARD_PACKET) { } else {
switch (gspca_dev->last_packet_type) {
case DISCARD_PACKET:
if (packet_type == LAST_PACKET) if (packet_type == LAST_PACKET)
gspca_dev->last_packet_type = packet_type; gspca_dev->last_packet_type = packet_type;
return; return;
case LAST_PACKET:
return;
}
} }
/* append the packet to the frame buffer */ /* append the packet to the frame buffer */
...@@ -454,6 +459,12 @@ void gspca_frame_add(struct gspca_dev *gspca_dev, ...@@ -454,6 +459,12 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
gspca_dev->frsz); gspca_dev->frsz);
packet_type = DISCARD_PACKET; packet_type = DISCARD_PACKET;
} else { } else {
/* !! image is NULL only when last pkt is LAST or DISCARD
if (gspca_dev->image == NULL) {
err("gspca_frame_add() image == NULL");
return;
}
*/
memcpy(gspca_dev->image + gspca_dev->image_len, memcpy(gspca_dev->image + gspca_dev->image_len,
data, len); data, len);
gspca_dev->image_len += len; gspca_dev->image_len += len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment