[FFmpeg-cvslog] avformat/concat: Check protocol prefix

Michael Niedermayer git at videolan.org
Thu Jan 28 16:11:48 CET 2016


ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Wed Jan 20 11:10:27 2016 +0100| [cb88f428b32f37a77f88d864a79135b3c80c39ef] | committer: Michael Niedermayer

avformat/concat: Check protocol prefix

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 8e32d014322eada1812af268d7ea9d53169d279c)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb88f428b32f37a77f88d864a79135b3c80c39ef
---

 libavformat/concat.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/concat.c b/libavformat/concat.c
index 81fe970..7bcc279 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) {



More information about the ffmpeg-cvslog mailing list