mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

helpers.cpp: introduce safe_strncpy() and use it

Browse Source 
Origin commit data
------------------
Commit: 72edb6b46d
Author: GetAway <get-away@t-online.de>
Date: 2019-06-18 (Tue, 18 Jun 2019)
This commit is contained in:
GetAway
2019-06-18 22:59:07 +02:00
committed by vanhofen
parent bc8a3536cb
commit e033f640f3
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/system/helpers.cpp
View File

@@ -402,12 +402,35 @@ int mkdirhier(const char *pathname, mode_t mode)
}
# endif
/* This function is a replacement which makes sure that a \0 is always added,
cuz standard strncpy does not terminate the string if the source is exactly
as long or longer as the specified size. This can raise security issues.
num should be the real size of char array (do not subtract -1)
*/
void safe_strncpy(char *dest, const char *src, size_t num)
{
if(!src)
{
dest[0] = '\0';
return;
}
uint32_t l, size = strlen(src);
if(size > num - 1)
l = num - 1;
else
l = size;
memcpy(dest, src, l);
dest[l] = '\0';
}
int safe_mkdir(const char * path)
{
struct statfs s;
size_t l = strlen(path);
char d[l + 3];
strncpy(d, path, l);
char d[l];
safe_strncpy(d, path, l);
// skip trailing slashes
while (l > 0 && d[l - 1] == '/')
@@ -739,7 +762,7 @@ const char *cstr_replace(const char *search, const char *replace, const char *te
tmp = strncpy(tmp, replace, len_replace) + len_replace;
text += len_front + len_search; // move to next "end of search"
}
strncpy(tmp, text, strlen(text));
safe_strncpy(tmp, text, strlen(text));
return result;
}