Skip to content
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

Jump to bottom

Convert strlen calls to strnlen #3059

Merged
merged 7 commits into from
Sep 9, 2022
Merged

Convert strlen calls to strnlen #3059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2f15656
wsevh: optimize string length check
tmatth Sep 8, 2022
10dfb76
streaming: optimize string length checks
tmatth Sep 8, 2022
6f9cb16
pp-rec: optimize string length check
tmatth Sep 8, 2022
dd2a098
sdp-utils: optimize string length checks
tmatth Sep 8, 2022
b5d38ee
sdp: optimize string length checks
tmatth Sep 8, 2022
7c8e196
http: optimize string length checks
tmatth Sep 8, 2022
6556ba7
transports: unix: optimize string length check
tmatth Sep 8, 2022
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
2 changes: 1 addition & 1 deletion src/events/janus_wsevh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ int janus_wsevh_init(const char *config_path) {
goto error;
}
path[0] = '/';
if(strlen(p) > 1)
if(strnlen(p, 1 + 1) > 1)
g_strlcpy(path + 1, p, sizeof(path)-2);
/* Before connecting, let's check if the server expects a subprotocol */
item = janus_config_get(config, config_general, janus_config_type_item, "subprotocol");
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/janus_streaming.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7663,7 +7663,7 @@ static int janus_streaming_rtsp_connect_to_server(janus_streaming_mountpoint *mp
index++;
continue;
}
if(strlen(line) < 3) {
if(strnlen(line, 3) < 3) {
JANUS_LOG(LOG_ERR, "Invalid RTSP line (%zu bytes): %s\n", strlen(line), line);
success = FALSE;
break;
Expand Down Expand Up @@ -7843,7 +7843,7 @@ static int janus_streaming_rtsp_connect_to_server(janus_streaming_mountpoint *mp
index++;
continue;
}
if(strlen(line) < 3) {
if(strnlen(line, 3) < 3) {
JANUS_LOG(LOG_ERR, "Invalid RTSP line (%zu bytes): %s\n", strlen(line), line);
success = FALSE;
break;
Expand Down
2 changes: 1 addition & 1 deletion src/postprocessing/janus-pp-rec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ static char *janus_pp_extensions_string(const char **allowed, char *supported, s
janus_strlcat(supported, "[", suplen);
const char **ext = allowed;
while(*ext != NULL) {
if(strlen(supported) > 1)
if(strnlen(supported, 1 + 1) > 1)
janus_strlcat(supported, ", ", suplen);
janus_strlcat(supported, *ext, suplen);
ext++;
Expand Down
4 changes: 2 additions & 2 deletions src/sdp-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ janus_sdp *janus_sdp_parse(const char *sdp, char *error, size_t errlen) {
index++;
continue;
}
if(strlen(line) < 3) {
if(strnlen(line, 3) < 3) {
if(error)
g_snprintf(error, errlen, "Invalid line (%zu bytes): %s", strlen(line), line);
success = FALSE;
Expand Down Expand Up @@ -465,7 +465,7 @@ janus_sdp *janus_sdp_parse(const char *sdp, char *error, size_t errlen) {
/* Start with media type, port and protocol */
char type[32];
char proto[64];
if(strlen(line) > 200) {
if(strnlen(line, 200 + 1) > 200) {
janus_sdp_mline_destroy(m);
if(error)
g_snprintf(error, errlen, "Invalid m= line (too long): %zu", strlen(line));
Expand Down
6 changes: 3 additions & 3 deletions src/sdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ janus_sdp *janus_sdp_preparse(void *ice_handle, const char *jsep_sdp, char *erro
return NULL;
}
if((m->type == JANUS_SDP_AUDIO || m->type == JANUS_SDP_VIDEO) && m->port > 0) {
if(strlen(a->value) > 16) {
if(strnlen(a->value, 16 + 1) > 16) {
JANUS_LOG(LOG_ERR, "[%"SCNu64"] mid on m-line #%d too large: (%zu > 16)\n",
handle->handle_id, m->index, strlen(a->value));
janus_sdp_destroy(parsed_sdp);
Expand Down Expand Up @@ -298,7 +298,7 @@ int janus_sdp_process_remote(void *ice_handle, janus_sdp *remote_sdp, gboolean r
if(a->name && a->value) {
if(!strcasecmp(a->name, "mid")) {
/* Found mid attribute */
if(strlen(a->value) > 16) {
if(strnlen(a->value, 16 + 1) > 16) {
JANUS_LOG(LOG_ERR, "[%"SCNu64"] mid on m-line #%d too large: (%zu > 16)\n",
handle->handle_id, m->index, strlen(a->value));
return -2;
Expand Down Expand Up @@ -759,7 +759,7 @@ int janus_sdp_process_local(void *ice_handle, janus_sdp *remote_sdp, gboolean up
if(a->name && a->value) {
if(!strcasecmp(a->name, "mid")) {
/* Found mid attribute */
if(strlen(a->value) > 16) {
if(strnlen(a->value, 16 + 1) > 16) {
JANUS_LOG(LOG_ERR, "[%"SCNu64"] mid on m-line #%d too large: (%zu > 16)\n",
handle->handle_id, m->index, strlen(a->value));
return -2;
Expand Down
8 changes: 4 additions & 4 deletions src/transports/janus_http.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ int janus_http_init(janus_transport_callbacks *callback, const char *config_path
return -1;
}
ws_path = g_strdup(item->value);
if(strlen(ws_path) > 1 && ws_path[strlen(ws_path)-1] == '/') {
if(strnlen(ws_path, 1 + 1) > 1 && ws_path[strlen(ws_path)-1] == '/') {
/* Remove the trailing slash, it makes things harder when we parse requests later */
ws_path[strlen(ws_path)-1] = '\0';
}
Expand All @@ -700,7 +700,7 @@ int janus_http_init(janus_transport_callbacks *callback, const char *config_path
return -1;
}
admin_ws_path = g_strdup(item->value);
if(strlen(admin_ws_path) > 1 && admin_ws_path[strlen(admin_ws_path)-1] == '/') {
if(strnlen(admin_ws_path, 1 + 1) > 1 && admin_ws_path[strlen(admin_ws_path)-1] == '/') {
/* Remove the trailing slash, it makes things harder when we parse requests later */
admin_ws_path[strlen(admin_ws_path)-1] = '\0';
}
Expand Down Expand Up @@ -1423,7 +1423,7 @@ static MHD_Result janus_http_handler(void *cls, struct MHD_Connection *connectio
}
/* Get path components */
if(strcasecmp(url, ws_path)) {
if(strlen(ws_path) > 1) {
if(strnlen(ws_path, 1 + 1) > 1) {
basepath = g_strsplit(url, ws_path, -1);
} else {
/* The base path is the web server too itself, we process the url itself */
Expand Down Expand Up @@ -1821,7 +1821,7 @@ static MHD_Result janus_http_admin_handler(void *cls, struct MHD_Connection *con
}
/* Get path components */
if(strcasecmp(url, admin_ws_path)) {
if(strlen(admin_ws_path) > 1) {
if(strnlen(admin_ws_path, 1 + 1) > 1) {
basepath = g_strsplit(url, admin_ws_path, -1);
} else {
/* The base path is the web server too itself, we process the url itself */
Expand Down
2 changes: 1 addition & 1 deletion src/transports/janus_pfunix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ static int janus_pfunix_create_socket(char *pfname, gboolean use_dgram) {
if(pfname == NULL)
return -1;
int fd = -1;
if(strlen(pfname) > UNIX_PATH_MAX) {
if(strnlen(pfname, UNIX_PATH_MAX + 1) > UNIX_PATH_MAX) {
JANUS_LOG(LOG_WARN, "The provided path name (%s) is longer than %lu characters, it will be truncated\n", pfname, UNIX_PATH_MAX);
pfname[UNIX_PATH_MAX] = '\0';
}
Expand Down