diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2009-02-25 17:48:40 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2009-02-25 17:48:40 +0200 |
| commit | 1c195ab280da561f38e54449e4eb3d6882c69b3b (patch) | |
| tree | 12583570730c9e5a1505416aa445666aa1449f6b /compat | |
| parent | d7aa6d1b2d6f3fc48b8287ea04c741078b22f2da (diff) | |
Fix strncpy length parameters to avoid non-nul-terminated strings
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/fakehid.c | 2 | ||||
| -rw-r--r-- | compat/sdp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compat/fakehid.c b/compat/fakehid.c index bed05c36..438185d3 100644 --- a/compat/fakehid.c +++ b/compat/fakehid.c @@ -97,7 +97,7 @@ static int uinput_create(char *name, int keyboard, int mouse) memset(&dev, 0, sizeof(dev)); if (name) - strncpy(dev.name, name, UINPUT_MAX_NAME_SIZE); + strncpy(dev.name, name, UINPUT_MAX_NAME_SIZE - 1); dev.id.bustype = BUS_BLUETOOTH; dev.id.vendor = 0x0000; diff --git a/compat/sdp.c b/compat/sdp.c index bb188f6a..d411c05f 100644 --- a/compat/sdp.c +++ b/compat/sdp.c @@ -259,11 +259,11 @@ int get_sdp_device_info(const bdaddr_t *src, const bdaddr_t *dst, struct hidp_co strncat(req->name, pdlist->val.str, sizeof(req->name) - strlen(req->name)); } else - strncpy(req->name, pdlist->val.str, sizeof(req->name)); + strncpy(req->name, pdlist->val.str, sizeof(req->name) - 1); } else { pdlist2 = sdp_data_get(rec, 0x0100); if (pdlist2) - strncpy(req->name, pdlist2->val.str, sizeof(req->name)); + strncpy(req->name, pdlist2->val.str, sizeof(req->name) - 1); } pdlist = sdp_data_get(rec, 0x0201); |