diff mbox

[FFmpeg-devel,1/2] concatdec: Do not pass NULL to memcmp

Message ID 20170706173421.1257-2-derek.buitenhuis@gmail.com
State Accepted
Commit 99c68861f9c79033e09ad842e2651a4b3aea95ea
Headers show

Commit Message

Derek Buitenhuis July 6, 2017, 5:34 p.m. UTC 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 libavformat/concatdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nicolas George July 6, 2017, 5:45 p.m. UTC | #1 
L'octidi 18 messidor, an CCXXV, Derek Buitenhuis a écrit :
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
>  libavformat/concatdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Ok. Thanks.

Regards,
diff mbox

Patch

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index e57e5ce0ec..e8b37d6a08 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -120,7 +120,7 @@  static int add_file(AVFormatContext *avf, char *filename, ConcatFile **rfile,
 
     proto = avio_find_protocol_name(filename);
     proto_len = proto ? strlen(proto) : 0;
-    if (!memcmp(filename, proto, proto_len) &&
+    if (proto && !memcmp(filename, proto, proto_len) &&
         (filename[proto_len] == ':' || filename[proto_len] == ',')) {
         url = filename;
         filename = NULL;