Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

do not use strncpy, then

This commit is contained in:
Enno Rehling 2017-09-18 07:53:02 +02:00
parent eca1e5f973
commit 97dc98862b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kernel/equipment.c
View File

@ -225,13 +225,15 @@ equipment *get_equipment(const char *eqname)
equipment *create_equipment(const char *eqname) equipment *create_equipment(const char *eqname)
{ {
size_t len = strlen(eqname);
eq_entry ent; eq_entry ent;
if (strlen(eqname) > EQNAMELEN) { if (len > EQNAMELEN) {
log_error("equipment names should be no longer than %d bytes: %s", EQNAMELEN, eqname); log_error("equipment names should be no longer than %d bytes: %s", EQNAMELEN, eqname);
len = EQNAMELEN;
} }
/* OBS: we require the nul-padding property of strncpy here, so do not use strlcpy: */ memset(ent.key, 0, EQNAMELEN);
strncpy(ent.key, eqname, EQNAMELEN); memcpy(ent.key, eqname, len);
ent.value = (equipment *)calloc(1, sizeof(equipment)); ent.value = (equipment *)calloc(1, sizeof(equipment));
ent.value->name = strdup(eqname); ent.value->name = strdup(eqname);