---

yaml --- r: 92799 b: refs/heads/master c: d2b213f h: refs/heads/master i: 92797: 714b05c 92795: 8569bb8 92791: 7ed8f43 92783: 13dc86b 92767: 3f2a3a7 92735: d918037 92671: 9942408 v: v3
git-mirror · Apr 24, 2008 · 50ff341 · 50ff341
1 parent 54939c7
commit 50ff341
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 867e835f4db4eba6d49072382cc05fc210c4ed1c
+refs/heads/master: d2b213f7b76f187c4391079c7581d3a08b940133
diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -742,7 +742,8 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
 
 		memset(vcap, 0, sizeof(*vcap));
 		strcpy(vcap->driver, IVTV_DRIVER_NAME);     /* driver name */
-		strcpy(vcap->card, itv->card_name); 	    /* card type */
+		strncpy(vcap->card, itv->card_name,
+				sizeof(vcap->card)-1); 	    /* card type */
 		strcpy(vcap->bus_info, pci_name(itv->dev)); /* bus info... */
 		vcap->version = IVTV_DRIVER_VERSION; 	    /* version */
 		vcap->capabilities = itv->v4l2_cap; 	    /* capabilities */