RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "avformat/rtp: Pass sources and block filter addresses via sdp file for rtp" 

This reverts commit b71685865f.

The commit lead to the use of an uninitialized variable.
Other issues were listed by Andreas Rheinhardt:
https://ffmpeg.org/pipermail/ffmpeg-devel/2020-March/259150.html

(cherry picked from commit 8b1f07ef51)

In addition, it is not understandable why the patch that neither
claims to fix a regression nor a security issue was backported.
This commit is contained in:
Carl Eugen Hoyos 2020-04-05 11:58:02 +02:00
parent 5b61639a21
commit d1e8be3411
1 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
libavformat/rtsp.c
View File

@ -2447,8 +2447,8 @@ static int rtp_probe(const AVProbeData *p)
static int rtp_read_header(AVFormatContext *s) static int rtp_read_header(AVFormatContext *s)
{ {
uint8_t recvbuf[RTP_MAX_PACKET_LENGTH]; uint8_t recvbuf[RTP_MAX_PACKET_LENGTH];
char host[500], sdp[1000], filters_buf[1000]; char host[500], sdp[500];
int ret, port, sdp_length, nc; int ret, port;
URLContext* in = NULL; URLContext* in = NULL;
int payload_type; int payload_type;
AVCodecParameters *par = NULL; AVCodecParameters *par = NULL;
@ -2456,7 +2456,6 @@ static int rtp_read_header(AVFormatContext *s)
AVIOContext pb; AVIOContext pb;
socklen_t addrlen = sizeof(addr); socklen_t addrlen = sizeof(addr);
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
const char *p;
if (!ff_network_init()) if (!ff_network_init())
return AVERROR(EIO); return AVERROR(EIO);
@ -2514,40 +2513,13 @@ static int rtp_read_header(AVFormatContext *s)
av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port,
NULL, 0, s->url); NULL, 0, s->url);
sdp_length = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length, snprintf(sdp, sizeof(sdp),
"v=0\r\nc=IN IP%d %s\r\n", "v=0\r\nc=IN IP%d %s\r\nm=%s %d RTP/AVP %d\r\n",
addr.ss_family == AF_INET ? 4 : 6, host); addr.ss_family == AF_INET ? 4 : 6, host,
par->codec_type == AVMEDIA_TYPE_DATA ? "application" :
p = strchr(s->url, '?'); par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio",
if (p) { port, payload_type);
static const char *filters[][2] = {{"sources", "incl"}, {"block", "excl"}, {NULL, NULL}}; av_log(s, AV_LOG_VERBOSE, "SDP:\n%s\n", sdp);
int i;
char *q;
for (i = 0; filters[i][0]; i++) {
if (av_find_info_tag(filters_buf, sizeof(filters_buf), filters[i][0], p)) {
q = filters_buf;
while ((q = strchr(q, ',')) != NULL)
*q = ' ';
nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
"a=source-filter:%s IN IP%d %s %s\r\n",
filters[i][1],
addr.ss_family == AF_INET ? 4 : 6, host,
filters_buf);
if (nc < 0 || nc + sdp_length >= sizeof(sdp))
goto fail_nobuf;
sdp_length += nc;
}
}
}
nc = snprintf(sdp + sdp_length, sizeof(sdp) - sdp_length,
"m=%s %d RTP/AVP %d\r\n",
par->codec_type == AVMEDIA_TYPE_DATA ? "application" :
par->codec_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio",
port, payload_type);
if (nc < 0 || nc + sdp_length >= sizeof(sdp))
goto fail_nobuf;
sdp_length += nc;
avcodec_parameters_free(&par); avcodec_parameters_free(&par);
ffio_init_context(&pb, sdp, strlen(sdp), 0, NULL, NULL, NULL, NULL); ffio_init_context(&pb, sdp, strlen(sdp), 0, NULL, NULL, NULL, NULL);
@ -2562,9 +2534,6 @@ static int rtp_read_header(AVFormatContext *s)
s->pb = NULL; s->pb = NULL;
return ret; return ret;
fail_nobuf:
ret = AVERROR(ENOBUFS);
av_log(s, AV_LOG_ERROR, "rtp_read_header(): not enough buffer space for sdp-headers\n");
fail: fail:
avcodec_parameters_free(&par); avcodec_parameters_free(&par);
if (in) if (in)