miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use strnlen()

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-01-25 16:14:36 +00:00
parent 36e9a5d57d
commit 4047abee33
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/db.c
View File

@@ -15,7 +15,7 @@ struct node {
_pure_ static inline size_t _pure_ static inline size_t
db_size(const uint8_t *a) db_size(const uint8_t *a)
{ {
return (a[0] ?: str_len((char *)a + 1)) + 1; return (a[0] ?: str_len((char *)a + 1, 4096)) + 1;
} }
_pure_ static inline size_t _pure_ static inline size_t

6
src/str.h
View File

@@ -24,12 +24,12 @@ str_cmp(const char *restrict sa, const char *restrict sb)
} }
_pure_ static inline size_t _pure_ static inline size_t
str_len(const char *restrict str) str_len(const char *restrict str, size_t len)
{ {
if (!str) if (!str)
return 0; return 0;
return strlen(str); return strnlen(str, len);
} }
static inline size_t static inline size_t
@@ -42,7 +42,7 @@ str_cat(char *dst, const char **src, size_t count, size_t dst_len)
size_t p = 0; size_t p = 0;
for (size_t i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {
size_t n = str_len(src[i]); size_t n = str_len(src[i], dst_len - len);
if (!n) if (!n)
continue; continue;