gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Change strlcat function name from redis to valkey (#440)

Browse Source 
Updated strlcat function and macros name (redis_strlcat ->
valkey_strlcat).

I think the standard strcat function is not safe.
(https://codeql.github.com/codeql-query-help/cpp/cpp-unsafe-strcat/)
So, it would be better to keep it as a safe function.

Signed-off-by: NAM UK KIM <namuk2004@naver.com>
This commit is contained in:
NAM UK KIM 2024-05-06 16:09:01 +09:00 committed by GitHub
parent 1b3199e070
commit 93f8a19b6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fmacros.h
View File

@ -65,7 +65,7 @@
#if (__GNUC__ && __GNUC__ >= 4) && !defined __APPLE__ #if (__GNUC__ && __GNUC__ >= 4) && !defined __APPLE__
int sprintf(char *str, const char *format, ...) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of snprintf instead"))); int sprintf(char *str, const char *format, ...) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of snprintf instead")));
char *strcpy(char *restrict dest, const char *src) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of valkey_strlcpy instead"))); char *strcpy(char *restrict dest, const char *src) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of valkey_strlcpy instead")));
char *strcat(char *restrict dest, const char *restrict src) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of redis_strlcat instead"))); char *strcat(char *restrict dest, const char *restrict src) __attribute__((deprecated("please avoid use of unsafe C functions. prefer use of valkey_strlcat instead")));
#endif #endif
#ifdef __linux__ #ifdef __linux__

4
src/rdb.c
View File

@ -1615,8 +1615,8 @@ void rdbRemoveTempFile(pid_t childpid, int from_signal) {
/* Generate temp rdb file name using async-signal safe functions. */ /* Generate temp rdb file name using async-signal safe functions. */
ll2string(pid, sizeof(pid), childpid); ll2string(pid, sizeof(pid), childpid);
valkey_strlcpy(tmpfile, "temp-", sizeof(tmpfile)); valkey_strlcpy(tmpfile, "temp-", sizeof(tmpfile));
redis_strlcat(tmpfile, pid, sizeof(tmpfile)); valkey_strlcat(tmpfile, pid, sizeof(tmpfile));
redis_strlcat(tmpfile, ".rdb", sizeof(tmpfile)); valkey_strlcat(tmpfile, ".rdb", sizeof(tmpfile));
if (from_signal) { if (from_signal) {
/* bg_unlink is not async-signal-safe, but in this case we don't really /* bg_unlink is not async-signal-safe, but in this case we don't really

2
src/strl.c
View File

@ -53,7 +53,7 @@ valkey_strlcpy(char *dst, const char *src, size_t dsize)
* If retval >= dsize, truncation occurred. * If retval >= dsize, truncation occurred.
*/ */
size_t size_t
redis_strlcat(char *dst, const char *src, size_t dsize) valkey_strlcat(char *dst, const char *src, size_t dsize)
{ {
const char *odst = dst; const char *odst = dst;
const char *osrc = src; const char *osrc = src;

2
src/util.h
View File

@ -98,7 +98,7 @@ int snprintf_async_signal_safe(char *to, size_t n, const char *fmt, ...)
int snprintf_async_signal_safe(char *to, size_t n, const char *fmt, ...); int snprintf_async_signal_safe(char *to, size_t n, const char *fmt, ...);
#endif #endif
size_t valkey_strlcpy(char *dst, const char *src, size_t dsize); size_t valkey_strlcpy(char *dst, const char *src, size_t dsize);
size_t redis_strlcat(char *dst, const char *src, size_t dsize); size_t valkey_strlcat(char *dst, const char *src, size_t dsize);
#ifdef SERVER_TEST #ifdef SERVER_TEST
int utilTest(int argc, char **argv, int flags); int utilTest(int argc, char **argv, int flags);