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

Fix RTSP parsing #2190

Merged
merged 3 commits into from
Jun 2, 2020
Merged

Fix RTSP parsing #2190

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d7548c
Improve fmtp parsing validation in RTSP's SDP
lionelnicolas Jun 1, 2020
5933222
Improve rtpmap parsing validation in RTSP's SDP
lionelnicolas Jun 1, 2020
f6ef5d8
Fix uninitialized variables when creating RTSP mountpoint
lionelnicolas Jun 1, 2020
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
22 changes: 16 additions & 6 deletions plugins/janus_streaming.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6191,11 +6191,17 @@ static int janus_streaming_rtsp_parse_sdp(const char *buffer, const char *name,
sscanf(s, "a=control:%2047s", control);
char *r = strstr(m, "a=rtpmap:");
if(r != NULL) {
sscanf(r, "a=rtpmap:%*d %2047s", rtpmap);
if (sscanf(r, "a=rtpmap:%*d%*[ ]%2047[^\r\n]s", rtpmap) != 1) {
JANUS_LOG(LOG_ERR, "[%s] cannot parse %s rtpmap...\n", name, media);
return -1;
}
}
char *f = strstr(m, "a=fmtp:");
if(f != NULL) {
sscanf(f, "a=fmtp:%*d %2047[^\r\n]s", fmtp);
if (sscanf(f, "a=fmtp:%*d%*[ ]%2047[^\r\n]s", fmtp) != 1) {
JANUS_LOG(LOG_ERR, "[%s] cannot parse %s fmtp...\n", name, media);
return -1;
}
}
char *c = strstr(m, "c=IN IP4");
if(c == NULL) {
Expand Down Expand Up @@ -6302,7 +6308,9 @@ static int janus_streaming_rtsp_connect_to_server(janus_streaming_mountpoint *mp
int ka_timeout = 0;
int vpt = -1;
char vrtpmap[2048];
vrtpmap[0] = '\0';
char vfmtp[2048];
vfmtp[0] = '\0';
char vcontrol[2048];
char uri[1024];
char vtransport[1024];
Expand All @@ -6315,7 +6323,9 @@ static int janus_streaming_rtsp_connect_to_server(janus_streaming_mountpoint *mp

int apt = -1;
char artpmap[2048];
artpmap[0] = '\0';
char afmtp[2048];
afmtp[0] = '\0';
char acontrol[2048];
char atransport[1024];
char ahost[256];
Expand Down Expand Up @@ -6717,15 +6727,15 @@ static int janus_streaming_rtsp_connect_to_server(janus_streaming_mountpoint *mp
if(mp->codecs.audio_pt == -1)
mp->codecs.audio_pt = doaudio ? apt : -1;
if(mp->codecs.audio_rtpmap == NULL)
mp->codecs.audio_rtpmap = doaudio ? g_strdup(artpmap) : NULL;
mp->codecs.audio_rtpmap = (doaudio && strlen(artpmap)) ? g_strdup(artpmap) : NULL;
if(mp->codecs.audio_fmtp == NULL)
mp->codecs.audio_fmtp = doaudio ? g_strdup(afmtp) : NULL;
mp->codecs.audio_fmtp = (doaudio && strlen(afmtp)) ? g_strdup(afmtp) : NULL;
if(mp->codecs.video_pt == -1)
mp->codecs.video_pt = dovideo ? vpt : -1;
if(mp->codecs.video_rtpmap == NULL)
mp->codecs.video_rtpmap = dovideo ? g_strdup(vrtpmap) : NULL;
mp->codecs.video_rtpmap = (dovideo && strlen(vrtpmap)) ? g_strdup(vrtpmap) : NULL;
if(mp->codecs.video_fmtp == NULL)
mp->codecs.video_fmtp = dovideo ? g_strdup(vfmtp) : NULL;
mp->codecs.video_fmtp = (dovideo && strlen(vfmtp)) ? g_strdup(vfmtp) : NULL;
source->audio_fd = audio_fds.fd;
source->audio_rtcp_fd = audio_fds.rtcp_fd;
source->remote_audio_port = asport;
Expand Down