highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/libsrt: Fix srt:// URL query string parsing

Browse Source 
Add missing NULL check and use ff_urldecode for string query
parameters.

Signed-off-by: Ingo Oppermann <ingo@datarhei.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Ingo Oppermann
2024-02-12 15:53:19 +01:00
committed by Marton Balint
parent e7f9edb469
commit 86128bd07a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@@ -714,7 +714,7 @@ OBJS-$(CONFIG_LIBRTMPS_PROTOCOL) += librtmp.o
OBJS-$(CONFIG_LIBRTMPT_PROTOCOL) += librtmp.o OBJS-$(CONFIG_LIBRTMPT_PROTOCOL) += librtmp.o
OBJS-$(CONFIG_LIBRTMPTE_PROTOCOL) += librtmp.o OBJS-$(CONFIG_LIBRTMPTE_PROTOCOL) += librtmp.o
OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL) += libsmbclient.o OBJS-$(CONFIG_LIBSMBCLIENT_PROTOCOL) += libsmbclient.o
OBJS-$(CONFIG_LIBSRT_PROTOCOL) += libsrt.o OBJS-$(CONFIG_LIBSRT_PROTOCOL) += libsrt.o urldecode.o
OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o
OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o

12
libavformat/libsrt.c
View File

@@ -32,6 +32,7 @@
#include "network.h" #include "network.h"
#include "os_support.h" #include "os_support.h"
#include "url.h" #include "url.h"
#include "urldecode.h"
/* This is for MPEG-TS and it's a default SRTO_PAYLOADSIZE for SRTT_LIVE (8 TS packets) */ /* This is for MPEG-TS and it's a default SRTO_PAYLOADSIZE for SRTT_LIVE (8 TS packets) */
#ifndef SRT_LIVE_DEFAULT_PAYLOAD_SIZE #ifndef SRT_LIVE_DEFAULT_PAYLOAD_SIZE
@@ -547,7 +548,11 @@ static int libsrt_open(URLContext *h, const char *uri, int flags)
} }
if (av_find_info_tag(buf, sizeof(buf), "passphrase", p)) { if (av_find_info_tag(buf, sizeof(buf), "passphrase", p)) {
av_freep(&s->passphrase); av_freep(&s->passphrase);
s->passphrase = av_strndup(buf, strlen(buf)); s->passphrase = ff_urldecode(buf, 1);
if (!s->passphrase) {
ret = AVERROR(ENOMEM);
goto err;
}
} }
#if SRT_VERSION_VALUE >= 0x010302 #if SRT_VERSION_VALUE >= 0x010302
if (av_find_info_tag(buf, sizeof(buf), "enforced_encryption", p)) { if (av_find_info_tag(buf, sizeof(buf), "enforced_encryption", p)) {
@@ -632,7 +637,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags)
} }
if (av_find_info_tag(buf, sizeof(buf), "streamid", p)) { if (av_find_info_tag(buf, sizeof(buf), "streamid", p)) {
av_freep(&s->streamid); av_freep(&s->streamid);
s->streamid = av_strdup(buf); s->streamid = ff_urldecode(buf, 1);
if (!s->streamid) { if (!s->streamid) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto err; goto err;
@@ -640,7 +645,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags)
} }
if (av_find_info_tag(buf, sizeof(buf), "smoother", p)) { if (av_find_info_tag(buf, sizeof(buf), "smoother", p)) {
av_freep(&s->smoother); av_freep(&s->smoother);
s->smoother = av_strdup(buf); s->smoother = ff_urldecode(buf, 1);
if(!s->smoother) { if(!s->smoother) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto err; goto err;
@@ -671,6 +676,7 @@ static int libsrt_open(URLContext *h, const char *uri, int flags)
err: err:
av_freep(&s->smoother); av_freep(&s->smoother);
av_freep(&s->streamid); av_freep(&s->streamid);
av_freep(&s->passphrase);
srt_cleanup(); srt_cleanup();
return ret; return ret;
} }