Skip to content

lib: use checked arithmetic in string and path length calculations #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uwezkhan wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

lib: use checked arithmetic in string and path length calculations #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/lib/path-util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static int t_getcwd_noalloc(char **dir_r, size_t *asize_r,
*error_r = t_strdup_printf("getcwd() failed: %m");
return -1;
}
asize = nearest_power(asize+1);
asize = nearest_power(MALLOC_ADD(asize, 1));
dir = t_buffer_get(asize);
}
if (asize_r != NULL)
Expand Down Expand Up @@ -92,7 +92,7 @@ static int path_normalize(const char *path, bool resolve_links,
i_assert(npath_pos >= npath);
if ((size_t)((npath_pos - npath) + seglen + 1) >= asize) {
ptrdiff_t npath_offset = npath_pos - npath;
asize = nearest_power(npath_offset + seglen + 2);
asize = nearest_power(MALLOC_ADD3(npath_offset, seglen, 2));
npath = t_buffer_reget(npath, asize);
npath_pos = npath + npath_offset;
}
Expand Down Expand Up @@ -143,7 +143,7 @@ static int path_normalize(const char *path, bool resolve_links,
i_assert(npath_pos >= npath);
if ((size_t)((npath_pos - npath) + espace + lsize) >= asize) {
ptrdiff_t npath_offset = npath_pos - npath;
asize = nearest_power((npath_offset + espace + lsize) + 1);
asize = nearest_power(MALLOC_ADD(MALLOC_ADD3(npath_offset, espace, lsize), 1));
lsize = asize - (npath_offset + espace);
npath = t_buffer_reget(npath, asize);
npath_pos = npath + npath_offset;
Expand Down Expand Up @@ -191,7 +191,7 @@ static int path_normalize(const char *path, bool resolve_links,
if ((size_t)((npath_pos - npath) + espace + lsize) >= asize ||
lsize == (size_t)ret) {
ptrdiff_t npath_offset = npath_pos - npath;
asize = nearest_power((npath_offset + espace + lsize) + 1);
asize = nearest_power(MALLOC_ADD(MALLOC_ADD3(npath_offset, espace, lsize), 1));
lsize = asize - (npath_offset + espace);
npath = t_buffer_reget(npath, asize);
npath_pos = npath + npath_offset;
Expand Down Expand Up @@ -344,7 +344,7 @@ int t_readlink(const char *path, const char **dest_r, const char **error_r)

dest = t_buffer_get(size);
while ((ret = readlink(path, dest, size)) >= (ssize_t)size) {
size = nearest_power(size+1);
size = nearest_power(MALLOC_ADD(size, 1));
dest = t_buffer_get(size);
}
if (ret < 0) {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/strfuncs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ char *vstrconcat(const char *str1, va_list args, size_t *ret_len)

if (i + len >= bufsize) {
/* need more memory */
bufsize = nearest_power(i + len + 1);
bufsize = nearest_power(MALLOC_ADD3(i, len, 1));
temp = t_buffer_reget(temp, bufsize);
}

Expand Down Expand Up @@ -886,7 +886,7 @@ p_strarray_join_n(pool_t pool, const char *const *arr, unsigned int arr_len,

for (i = 0; i < arr_len; i++) {
len = strlen(arr[i]);
needed_space = pos + len + sep_len + 1;
needed_space = MALLOC_ADD(MALLOC_ADD3(pos, len, sep_len), 1);
if (needed_space > alloc_len) {
alloc_len = nearest_power(needed_space);
str = t_buffer_reget(str, alloc_len);
Expand Down