|
@@ -76,25 +76,19 @@ static void hidp_copy_session(struct hidp_session *session, struct hidp_conninfo
|
|
|
ci->flags = session->flags;
|
|
|
ci->state = BT_CONNECTED;
|
|
|
|
|
|
- ci->vendor = 0x0000;
|
|
|
- ci->product = 0x0000;
|
|
|
- ci->version = 0x0000;
|
|
|
-
|
|
|
if (session->input) {
|
|
|
ci->vendor = session->input->id.vendor;
|
|
|
ci->product = session->input->id.product;
|
|
|
ci->version = session->input->id.version;
|
|
|
if (session->input->name)
|
|
|
- strncpy(ci->name, session->input->name, 128);
|
|
|
+ strlcpy(ci->name, session->input->name, 128);
|
|
|
else
|
|
|
- strncpy(ci->name, "HID Boot Device", 128);
|
|
|
- }
|
|
|
-
|
|
|
- if (session->hid) {
|
|
|
+ strlcpy(ci->name, "HID Boot Device", 128);
|
|
|
+ } else if (session->hid) {
|
|
|
ci->vendor = session->hid->vendor;
|
|
|
ci->product = session->hid->product;
|
|
|
ci->version = session->hid->version;
|
|
|
- strncpy(ci->name, session->hid->name, 128);
|
|
|
+ strlcpy(ci->name, session->hid->name, 128);
|
|
|
}
|
|
|
}
|
|
|
|