Commit 6b81bef8 authored Aug 27, 2010 by Julia Lawall Committed by Mauro Carvalho Chehab Oct 21, 2010

V4L/DVB: drivers/media/video/em28xx: Remove potential NULL dereference

If the NULL test is necessary, the initialization involving a dereference of
the tested value should be moved after the NULL test.

The sematic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
type T;
expression E;
identifier i,fld;
statement S;
@@

- T i = E->fld;
+ T i;
  ... when != E
      when != i
  if (E == NULL) S
+ i = E->fld;
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent d7ef485d

drivers/media/video/em28xx/em28xx-video.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -277,12 +277,13 @@ static void em28xx_copy_vbi(struct em28xx *dev,
		{
		void startwrite, startread;
		int offset;
		int bytesperline = dev->vbi_width;
		int bytesperline;

		if (dev == NULL) {
		em28xx_isocdbg("dev is null\n");
		return;
		}
		bytesperline = dev->vbi_width;

		if (dma_q == NULL) {
		em28xx_isocdbg("dma_q is null\n");