Skip to content

fix: use bounded strlcpy/snprintf in jni-c-toxcore.c #795

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

Draft
orbisai0security wants to merge 1 commit into
base: zoff99/dev003
Choose a base branch
from
Draft

fix: use bounded strlcpy/snprintf in jni-c-toxcore.c #795

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
17 changes: 7 additions & 10 deletions jni-c-toxcore/jni-c-toxcore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,15 +488,16 @@ void dbg(int level, const char *fmt, ...)
level = 0;
}

level_and_format = malloc(strlen(fmt) + 3);
size_t fmt_len = strlen(fmt);
level_and_format = malloc(fmt_len + 3);

if(!level_and_format)
{
return;
}

fmt_copy = level_and_format + 2;
strcpy(fmt_copy, fmt);
memcpy(fmt_copy, fmt, fmt_len + 1);
level_and_format[1] = ':';

if(level == 0)
Expand Down Expand Up @@ -3603,8 +3604,7 @@ Java_com_zoffcc_applications_trifa_MainActivity_tox_1self_1get_1friend_1list(JNI
}

size_t numfriends = tox_self_get_friend_list_size(tox_global);
size_t memsize = (numfriends * sizeof(uint32_t));
uint32_t *friend_list = malloc(memsize);
uint32_t *friend_list = calloc(numfriends, sizeof(uint32_t));
uint32_t *friend_list_iter = friend_list;
jlongArray result;
tox_self_get_friend_list(tox_global, friend_list);
Expand Down Expand Up @@ -6478,8 +6478,7 @@ Java_com_zoffcc_applications_trifa_MainActivity_tox_1conference_1get_1chatlist(J
{
TRACE_LOGGER();
size_t numconferences = tox_conference_get_chatlist_size(tox_global);
size_t memsize = (numconferences * sizeof(uint32_t));
uint32_t *conferences_list = malloc(memsize);
uint32_t *conferences_list = calloc(numconferences, sizeof(uint32_t));
uint32_t *conferences_list_iter = conferences_list;
jlongArray result;
tox_conference_get_chatlist(tox_global, conferences_list);
Expand Down Expand Up @@ -7516,8 +7515,7 @@ Java_com_zoffcc_applications_trifa_MainActivity_tox_1group_1get_1grouplist(JNIEn
{
TRACE_LOGGER();
uint32_t numgroups = tox_group_get_number_groups(tox_global);
size_t memsize = (numgroups * sizeof(uint32_t));
uint32_t *groups_list = malloc(memsize);
uint32_t *groups_list = calloc(numgroups, sizeof(uint32_t));
uint32_t *groups_list_iter = groups_list;
jlongArray result;
tox_group_get_grouplist(tox_global, groups_list);
Expand Down Expand Up @@ -7574,8 +7572,7 @@ Java_com_zoffcc_applications_trifa_MainActivity_tox_1group_1get_1peerlist(JNIEnv
return NULL;
}

size_t memsize = (numpeers * sizeof(uint32_t));
uint32_t *peer_list = malloc(memsize);
uint32_t *peer_list = calloc(numpeers, sizeof(uint32_t));
uint32_t *peer_list_iter = peer_list;
jlongArray result;
Tox_Err_Group_Peer_Query error2;
Expand Down