aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-01-20 11:10:27 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2016-01-31 00:23:46 +0100
commit573a7b4c670681fa31607201dfe1aa81aee01440 (patch)
treefc828e3ec4abf2c5cf823cfe5e1f85648ac8eba4 /libavformat
parent3c7597f2e9c98fb4bcb62b0bd8262be36bbcd0b7 (diff)
downloadffmpeg-573a7b4c670681fa31607201dfe1aa81aee01440.tar.gz
avformat/concat: Check protocol prefix
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 8e32d014322eada1812af268d7ea9d53169d279c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/concat.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/concat.c b/libavformat/concat.c
index 81fe97082c..7bcc27905e 100644
--- a/libavformat/concat.c
+++ b/libavformat/concat.c
@@ -65,7 +65,10 @@ static av_cold int concat_open(URLContext *h, const char *uri, int flags)
struct concat_data *data = h->priv_data;
struct concat_nodes *nodes;
- av_strstart(uri, "concat:", &uri);
+ if (!av_strstart(uri, "concat:", &uri)) {
+ av_log(h, AV_LOG_ERROR, "URL %s lacks prefix\n", uri);
+ return AVERROR(EINVAL);
+ }
for (i = 0, len = 1; uri[i]; i++) {
if (uri[i] == *AV_CAT_SEPARATOR) {