diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 22:15:03 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 22:15:03 -0200 |
| commit | 1f0f6394be119a5916c8b5c6caa4910336544945 (patch) | |
| tree | ca5310c2fcc013f268797ab3b73c5d4f70cf3f2f /linux | |
| parent | cbc456f2703b542b2548726fee33cb664004047a (diff) | |
| download | mediapointer-dvb-s2-1f0f6394be119a5916c8b5c6caa4910336544945.tar.gz mediapointer-dvb-s2-1f0f6394be119a5916c8b5c6caa4910336544945.tar.bz2 | |
v4l core: a few get ioctls were lacking memory clean
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/v4l2-ioctl.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/linux/drivers/media/video/v4l2-ioctl.c b/linux/drivers/media/video/v4l2-ioctl.c index 40b041402..bc4128d60 100644 --- a/linux/drivers/media/video/v4l2-ioctl.c +++ b/linux/drivers/media/video/v4l2-ioctl.c @@ -1480,9 +1480,15 @@ static int __video_do_ioctl(struct file *file, case VIDIOC_G_CROP: { struct v4l2_crop *p = arg; + __u32 type; if (!ops->vidioc_g_crop) break; + + type = p->type; + memset(p, 0, sizeof(*p)); + p->type = type; + dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names)); ret = ops->vidioc_g_crop(file, fh, p); if (!ret) @@ -1503,10 +1509,16 @@ static int __video_do_ioctl(struct file *file, case VIDIOC_CROPCAP: { struct v4l2_cropcap *p = arg; + __u32 type; /*FIXME: Should also show v4l2_fract pixelaspect */ if (!ops->vidioc_cropcap) break; + + type = p->type; + memset(p, 0, sizeof(*p)); + p->type = type; + dbgarg(cmd, "type=%s\n", prt_names(p->type, v4l2_type_names)); ret = ops->vidioc_cropcap(file, fh, p); if (!ret) { @@ -1521,6 +1533,9 @@ static int __video_do_ioctl(struct file *file, if (!ops->vidioc_g_jpegcomp) break; + + memset(p, 0, sizeof(*p)); + ret = ops->vidioc_g_jpegcomp(file, fh, p); if (!ret) dbgarg(cmd, "quality=%d, APPn=%d, " |