cellular-infrastructure
/
osmocom-analog
9
1
Fork 2
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

Bugfix: Correct handling of n in strncat()

This commit is contained in:
Andreas Eversberg 2019-09-28 15:49:04 +02:00
parent 830794bae4
commit 860f91af6f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jolly/dsp.c
View File

@ -144,7 +144,7 @@ void set_speech_string(jolly_t *jolly, char announcement, const char *number)
{
jolly->speech_string[0] = announcement;
jolly->speech_string[1] = '\0';
strncat(jolly->speech_string, number, sizeof(jolly->speech_string) - 1);
strncat(jolly->speech_string, number, sizeof(jolly->speech_string) - strlen(number) - 1);
jolly->speech_digit = 0;
jolly->speech_pos = 0;
}

4
src/libsdr/sdr.c
View File

@ -636,7 +636,7 @@ int sdr_start(void *inst)
return rc;
}
pthread_getname_np(tid, tname, sizeof(tname));
strncat(tname, "-sdr_tx", sizeof(tname) - 1);
strncat(tname, "-sdr_tx", sizeof(tname) - 7 - 1);
tname[sizeof(tname) - 1] = '\0';
pthread_setname_np(tid, tname);
sdr->thread_read.running = 1;
@ -648,7 +648,7 @@ int sdr_start(void *inst)
return rc;
}
pthread_getname_np(tid, tname, sizeof(tname));
strncat(tname, "-sdr_rx", sizeof(tname) - 1);
strncat(tname, "-sdr_rx", sizeof(tname) - 7 - 1);
tname[sizeof(tname) - 1] = '\0';
pthread_setname_np(tid, tname);
}