status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

always nul terminate string after strncpy() 

see #663
This commit is contained in:
Thomas Bernard 2023-11-26 00:16:41 +01:00
parent 215091b546
commit c3f1a2cb30
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
miniupnpd/netfilter_nft/nftpinhole.c
View File

@ -166,11 +166,12 @@ find_pinhole(const char * ifname,
if (timestamp) if (timestamp)
*timestamp = ts; *timestamp = ts;
if (desc) { if (desc && (desc_len > 0)) {
char * pd = strchr(p->desc, ':'); char * pd = strchr(p->desc, ':');
if(pd) { if(pd) {
pd += 2; pd += 2;
strncpy(desc, pd, desc_len); strncpy(desc, pd, desc_len);
desc[desc_len - 1] = '\0';
} }
} }
@ -203,7 +204,8 @@ delete_pinhole(unsigned short uid)
if (p->desc_len == 0) if (p->desc_len == 0)
continue; continue;
strncpy(tmp_label, p->desc, p->desc_len); strncpy(tmp_label, p->desc, sizeof(tmp_label));
tmp_label[sizeof(tmp_label) - 1] = '\0';
strtok(tmp_label, " "); strtok(tmp_label, " ");
if (0 == strcmp(tmp_label, label_start)) { if (0 == strcmp(tmp_label, label_start)) {
r = rule_del_handle(p); r = rule_del_handle(p);
@ -254,8 +256,10 @@ update_pinhole(unsigned short uid, unsigned int timestamp)
if (p->desc_len == 0) if (p->desc_len == 0)
continue; continue;
strncpy(tmp_label, p->desc, p->desc_len); strncpy(tmp_label, p->desc, sizeof(tmp_label));
tmp_label[sizeof(tmp_label) - 1] = '\0';
strtok(tmp_label, " "); strtok(tmp_label, " ");
/* check for the right uid */
if (0 == strcmp(tmp_label, label_start)) { if (0 == strcmp(tmp_label, label_start)) {
/* Source IP Address */ /* Source IP Address */
// Check if empty // Check if empty
@ -354,7 +358,8 @@ get_pinhole_info(unsigned short uid,
if (p->desc_len == 0) if (p->desc_len == 0)
continue; continue;
strncpy(tmp_label, p->desc, p->desc_len); strncpy(tmp_label, p->desc, sizeof(tmp_label));
tmp_label[sizeof(tmp_label) - 1] = '\0';
strtok(tmp_label, " "); strtok(tmp_label, " ");
if (0 == strcmp(tmp_label, label_start)) { if (0 == strcmp(tmp_label, label_start)) {
/* Source IP Address */ /* Source IP Address */