From 317007103c01d71cd13de4fae759a4bb8f428c02 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Sun, 21 Apr 2013 07:10:03 -0300 Subject: [PATCH] --- yaml --- r: 367083 b: refs/heads/master c: c06ca8f92b0b23dfd209fea27d71046c9c776910 h: refs/heads/master i: 367081: 7913cd22356da4936a4c74fe7dd4cbe883d39f98 367079: 9bbf2555ecef180a07f580400a0e159da0d309f7 v: v3 --- [refs] | 2 +- trunk/drivers/media/media-device.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b2250a1dd576..c5a818fc117e 100644 --- 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 index 99b80b6f7f67..1957c0df08fd 100644 --- 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;