Skip to content

Commit 5f4fa0c

Browse files
committed
Increase maximum size of custom headers in SIP plugin (fixes #3459)
1 parent 88d74a0 commit 5f4fa0c

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

src/plugins/janus_sip.c

+19-19
Original file line numberDiff line numberDiff line change
@@ -1638,8 +1638,8 @@ static void janus_sip_parse_custom_headers(json_t *root, char *custom_headers, s
16381638
iter = json_object_iter_next(headers, iter);
16391639
continue;
16401640
}
1641-
char h[255];
1642-
g_snprintf(h, 255, "%s: %s", key, json_string_value(value));
1641+
char h[1024];
1642+
g_snprintf(h, sizeof(h), "%s: %s", key, json_string_value(value));
16431643
JANUS_LOG(LOG_VERB, "Adding custom header, %s\n", h);
16441644
janus_strlcat(custom_headers, h, size - 2);
16451645
janus_strlcat(custom_headers, "\r\n", size);
@@ -1667,12 +1667,12 @@ static void janus_sip_parse_custom_contact_params(json_t *root, char *custom_par
16671667
iter = json_object_iter_next(params, iter);
16681668
continue;
16691669
}
1670-
char h[255];
1670+
char h[1024];
16711671
if(first) {
16721672
first = FALSE;
1673-
g_snprintf(h, 255, "%s=%s", key, json_string_value(value));
1673+
g_snprintf(h, sizeof(h), "%s=%s", key, json_string_value(value));
16741674
} else {
1675-
g_snprintf(h, 255, ";%s=%s", key, json_string_value(value));
1675+
g_snprintf(h, sizeof(h), ";%s=%s", key, json_string_value(value));
16761676
}
16771677
JANUS_LOG(LOG_VERB, "Adding custom param, %s\n", h);
16781678
janus_strlcat(custom_params, h, size);
@@ -1952,12 +1952,12 @@ int janus_sip_init(janus_callbacks *callback, const char *config_path) {
19521952

19531953
/* Read configuration */
19541954
char filename[255];
1955-
g_snprintf(filename, 255, "%s/%s.jcfg", config_path, JANUS_SIP_PACKAGE);
1955+
g_snprintf(filename, sizeof(filename), "%s/%s.jcfg", config_path, JANUS_SIP_PACKAGE);
19561956
JANUS_LOG(LOG_VERB, "Configuration file: %s\n", filename);
19571957
janus_config *config = janus_config_parse(filename);
19581958
if(config == NULL) {
19591959
JANUS_LOG(LOG_WARN, "Couldn't find .jcfg configuration file (%s), trying .cfg\n", JANUS_SIP_PACKAGE);
1960-
g_snprintf(filename, 255, "%s/%s.cfg", config_path, JANUS_SIP_PACKAGE);
1960+
g_snprintf(filename, sizeof(filename), "%s/%s.cfg", config_path, JANUS_SIP_PACKAGE);
19611961
JANUS_LOG(LOG_VERB, "Configuration file: %s\n", filename);
19621962
config = janus_config_parse(filename);
19631963
}
@@ -4692,15 +4692,15 @@ static void *janus_sip_handler(void *data) {
46924692
session->account.username, session->transaction);
46934693
/* Start recording this peer's audio and/or video */
46944694
if(record_peer_audio) {
4695-
memset(filename, 0, 255);
4695+
memset(filename, 0, sizeof(filename));
46964696
if(recording_base) {
46974697
/* Use the filename and path we have been provided */
4698-
g_snprintf(filename, 255, "%s-peer-audio", recording_base);
4698+
g_snprintf(filename, sizeof(filename), "%s-peer-audio", recording_base);
46994699
/* FIXME This only works if offer/answer happened */
47004700
rc = janus_recorder_create(NULL, session->media.audio_pt_name, filename);
47014701
} else {
47024702
/* Build a filename */
4703-
g_snprintf(filename, 255, "sip-%s-%s-%"SCNi64"-peer-audio",
4703+
g_snprintf(filename, sizeof(filename), "sip-%s-%s-%"SCNi64"-peer-audio",
47044704
session->account.username ? session->account.username : "unknown",
47054705
session->transaction ? session->transaction : "unknown",
47064706
now);
@@ -4718,15 +4718,15 @@ static void *janus_sip_handler(void *data) {
47184718
}
47194719
}
47204720
if(record_peer_video) {
4721-
memset(filename, 0, 255);
4721+
memset(filename, 0, sizeof(filename));
47224722
if(recording_base) {
47234723
/* Use the filename and path we have been provided */
4724-
g_snprintf(filename, 255, "%s-peer-video", recording_base);
4724+
g_snprintf(filename, sizeof(filename), "%s-peer-video", recording_base);
47254725
/* FIXME This only works if offer/answer happened */
47264726
rc = janus_recorder_create(NULL, session->media.video_pt_name, filename);
47274727
} else {
47284728
/* Build a filename */
4729-
g_snprintf(filename, 255, "sip-%s-%s-%"SCNi64"-peer-video",
4729+
g_snprintf(filename, sizeof(filename), "sip-%s-%s-%"SCNi64"-peer-video",
47304730
session->account.username ? session->account.username : "unknown",
47314731
session->transaction ? session->transaction : "unknown",
47324732
now);
@@ -4753,15 +4753,15 @@ static void *janus_sip_handler(void *data) {
47534753
(record_audio && record_video ? "audio and video" : (record_audio ? "audio" : "video")),
47544754
session->account.username, session->transaction);
47554755
if(record_audio) {
4756-
memset(filename, 0, 255);
4756+
memset(filename, 0, sizeof(filename));
47574757
if(recording_base) {
47584758
/* Use the filename and path we have been provided */
4759-
g_snprintf(filename, 255, "%s-user-audio", recording_base);
4759+
g_snprintf(filename, sizeof(filename), "%s-user-audio", recording_base);
47604760
/* FIXME This only works if offer/answer happened */
47614761
rc = janus_recorder_create(NULL, session->media.audio_pt_name, filename);
47624762
} else {
47634763
/* Build a filename */
4764-
g_snprintf(filename, 255, "sip-%s-%s-%"SCNi64"-own-audio",
4764+
g_snprintf(filename, sizeof(filename), "sip-%s-%s-%"SCNi64"-own-audio",
47654765
session->account.username ? session->account.username : "unknown",
47664766
session->transaction ? session->transaction : "unknown",
47674767
now);
@@ -4779,15 +4779,15 @@ static void *janus_sip_handler(void *data) {
47794779
}
47804780
}
47814781
if(record_video) {
4782-
memset(filename, 0, 255);
4782+
memset(filename, 0, sizeof(filename));
47834783
if(recording_base) {
47844784
/* Use the filename and path we have been provided */
4785-
g_snprintf(filename, 255, "%s-user-video", recording_base);
4785+
g_snprintf(filename, sizeof(filename), "%s-user-video", recording_base);
47864786
/* FIXME This only works if offer/answer happened */
47874787
rc = janus_recorder_create(NULL, session->media.video_pt_name, filename);
47884788
} else {
47894789
/* Build a filename */
4790-
g_snprintf(filename, 255, "sip-%s-%s-%"SCNi64"-own-video",
4790+
g_snprintf(filename, sizeof(filename), "sip-%s-%s-%"SCNi64"-own-video",
47914791
session->account.username ? session->account.username : "unknown",
47924792
session->transaction ? session->transaction : "unknown",
47934793
now);

0 commit comments

Comments
 (0)