akkartik
/
mu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

7233 - fix some warnings from gcc 9 

Make strncpy a little less error-prone.
Just use memcpy where that suffices:
  https://stackoverflow.com/questions/56782248/gcc-specified-bound-depends-on-the-length-of-the-source-argument/56782476#56782476
This commit is contained in:
Kartik Agaram 2020-11-13 20:53:32 -08:00
parent ea8a64cfb0
commit 236cf88a3e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/termbox/output.inl
View File

@ -179,7 +179,7 @@ static char *terminfo_try_path(const char *path, const char *term) {
}
void string_copy(char* dest, const char* src, int dest_capacity) {
strncpy(dest, src, dest_capacity);
strncpy(dest, src, dest_capacity-1);
dest[dest_capacity-1] = '\0';
}
@ -218,7 +218,7 @@ static char *load_terminfo(void) {
if (dirs) {
// snprintf guarantee for older compilers
assert(sizeof(tmp) > sizeof(dirs));
strncpy(tmp, dirs, sizeof(tmp));
string_copy(tmp, dirs, sizeof(tmp));
char *dir = strtok(tmp, ":");
while (dir) {
const char *cdir = dir;
@ -245,7 +245,7 @@ static const char *terminfo_copy_string(char *data, int str, int table) {
const char *src = data + table + off;
int len = strlen(src);
char *dst = malloc(len+1);
string_copy(dst, src, len+1);
memcpy(dst, src, len+1);
return dst;
}