---

yaml --- r: 367083 b: refs/heads/master c: c06ca8f h: refs/heads/master i: 367081: 7913cd2 367079: 9bbf255 v: v3
git-mirror · Apr 23, 2013 · 3170071 · 3170071
1 parent 1b2cbdc
commit 3170071
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59501bb792c66b85fb7fdbd740e788e3afc70bbd
+refs/heads/master: c06ca8f92b0b23dfd209fea27d71046c9c776910
diff --git a/trunk/drivers/media/media-device.c b/trunk/drivers/media/media-device.c
@@ -102,9 +102,12 @@ static long media_device_enum_entities(struct media_device *mdev,
 		return -EINVAL;
 
 	u_ent.id = ent->id;
-	u_ent.name[0] = '\0';
-	if (ent->name)
-		strlcpy(u_ent.name, ent->name, sizeof(u_ent.name));
+	if (ent->name) {
+		strncpy(u_ent.name, ent->name, sizeof(u_ent.name));
+		u_ent.name[sizeof(u_ent.name) - 1] = '\0';
+	} else {
+		memset(u_ent.name, 0, sizeof(u_ent.name));
+	}
 	u_ent.type = ent->type;
 	u_ent.revision = ent->revision;
 	u_ent.flags = ent->flags;