]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
V4L/DVB: drivers/media/video/zoran: Don't use initialized char array
authorJoe Perches <joe@perches.com>
Mon, 13 Sep 2010 22:07:14 +0000 (19:07 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:06:11 +0000 (01:06 -0200)
Just fill the array as necessary and terminate with 0

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/zoran/zoran_device.c

index 6f846abee3e40c0ea5da5b149bf24b77f8f64b4c..b02007e42150b18f744f28d47db9b1ac19eb2ffb 100644 (file)
@@ -1470,8 +1470,7 @@ zoran_irq (int             irq,
                    (zr->codec_mode == BUZ_MODE_MOTION_DECOMPRESS ||
                     zr->codec_mode == BUZ_MODE_MOTION_COMPRESS)) {
                        if (zr36067_debug > 1 && (!zr->frame_num || zr->JPEG_error)) {
-                               char sc[] = "0000";
-                               char sv[5];
+                               char sv[BUZ_NUM_STAT_COM + 1];
                                int i;
 
                                printk(KERN_INFO
@@ -1481,12 +1480,9 @@ zoran_irq (int             irq,
                                       zr->jpg_settings.field_per_buff,
                                       zr->JPEG_missed);
 
-                               strcpy(sv, sc);
-                               for (i = 0; i < 4; i++) {
-                                       if (le32_to_cpu(zr->stat_com[i]) & 1)
-                                               sv[i] = '1';
-                               }
-                               sv[4] = 0;
+                               for (i = 0; i < BUZ_NUM_STAT_COM; i++)
+                                       sv[i] = le32_to_cpu(zr->stat_com[i]) & 1 ? '1' : '0';
+                               sv[BUZ_NUM_STAT_COM] = 0;
                                printk(KERN_INFO
                                       "%s: stat_com=%s queue_state=%ld/%ld/%ld/%ld\n",
                                       ZR_DEVNAME(zr), sv,