Skip to content

Fix compiler warning with possible buffer overflow #26

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

Merged
smartnode merged 2 commits into from
Oct 25, 2019
Merged

Fix compiler warning with possible buffer overflow #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6072a4
Define default buffer size
smartnode Oct 25, 2019
47fa7d1
Fix compiler warning with possible buffer overflow
smartnode Oct 25, 2019
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
3 changes: 3 additions & 0 deletions include/telebot-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@

#define TELEBOT_API_URL "https://api.telegram.org"
#define TELEBOT_URL_SIZE 1024
#define TELEBOT_BUFFER_SECTOR 512
#define TELEBOT_BUFFER_BLOCK 1024
#define TELEBOT_BUFFER_PAGE 4096
#define TELEBOT_UPDATE_COUNT_MAX_LIMIT 100
#define TELEBOT_USER_PROFILE_PHOTOS_LIMIT 100

Expand Down
32 changes: 14 additions & 18 deletions src/telebot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ telebot_error_e telebot_get_updates(telebot_handler_t handle, int offset,
int limit, int timeout, telebot_update_type_e allowed_updates[],
int allowed_updates_count, telebot_update_t **updates, int *count)
{
int i = 0;
char allowed_updates_str[TELEBOT_BUFFER_PAGE] = {0, };
telebot_hdata_t *_handle = (telebot_hdata_t *)handle;
if (_handle == NULL)
return TELEBOT_ERROR_NOT_SUPPORTED;
Expand All @@ -150,19 +152,15 @@ telebot_error_e telebot_get_updates(telebot_handler_t handle, int offset,
*updates = NULL;
*count = 0;

int i = 0;
char allowed_updates_str[1024] = "";
if (allowed_updates_count > 0) {
snprintf(allowed_updates_str, 1024, "%s", "[");
strncat(allowed_updates_str, "[", TELEBOT_BUFFER_BLOCK);
for (i=0;i<allowed_updates_count;i++) {
strncat(allowed_updates_str, telebot_update_type_str[allowed_updates[i]],
TELEBOT_BUFFER_BLOCK);
if (i < (allowed_updates_count-1)) //intermediate element
snprintf(allowed_updates_str, 1024, "%s%s,", allowed_updates_str,
telebot_update_type_str[allowed_updates[i]]);
else // last element
snprintf(allowed_updates_str, 1024, "%s%s", allowed_updates_str,
telebot_update_type_str[allowed_updates[i]]);
strncat(allowed_updates_str, ",", TELEBOT_BUFFER_BLOCK);
}
snprintf(allowed_updates_str, 1024, "%s%s", allowed_updates_str,"]");
strncat(allowed_updates_str, "]", TELEBOT_BUFFER_BLOCK);
}

int _offset = offset != 0 ? offset : _handle->offset;
Expand Down Expand Up @@ -313,26 +311,24 @@ telebot_error_e telebot_set_webhook(telebot_handler_t handle, char *url,
char *certificate, int max_connections,
telebot_update_type_e allowed_updates[], int allowed_updates_count)
{
int i = 0;
char allowed_updates_str[TELEBOT_BUFFER_PAGE] = {0, };
telebot_hdata_t * _handle = (telebot_hdata_t *)handle;
if (_handle == NULL)
return TELEBOT_ERROR_NOT_SUPPORTED;

if (url == NULL)
return TELEBOT_ERROR_INVALID_PARAMETER;

int i = 0;
char allowed_updates_str[1024] = "";
if (allowed_updates_count > 0) {
snprintf(allowed_updates_str, 1024, "%s", "[");
strncat(allowed_updates_str, "[", TELEBOT_BUFFER_BLOCK);
for (i=0;i<allowed_updates_count;i++) {
strncat(allowed_updates_str, telebot_update_type_str[allowed_updates[i]],
TELEBOT_BUFFER_BLOCK);
if (i < (allowed_updates_count-1)) //intermediate element
snprintf(allowed_updates_str, 1024, "%s%s,", allowed_updates_str,
telebot_update_type_str[allowed_updates[i]]);
else // last element
snprintf(allowed_updates_str, 1024, "%s%s", allowed_updates_str,
telebot_update_type_str[allowed_updates[i]]);
strncat(allowed_updates_str, ",", TELEBOT_BUFFER_BLOCK);
}
snprintf(allowed_updates_str, 1024, "%s%s", allowed_updates_str, "]");
strncat(allowed_updates_str, "]", TELEBOT_BUFFER_BLOCK);
}

telebot_error_e ret = telebot_core_set_webhook(_handle->core_h, url,
Expand Down