fix crash in avformat producer on network URL

mltframework · Apr 13, 2021 · 531aa1a · 531aa1a
1 parent 8f2108e
commit 531aa1a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 
 project(MLT
-  VERSION 6.26.0
+  VERSION 6.26.1
   DESCRIPTION "Multimedia Framework"
   HOMEPAGE_URL "https://www.mltframework.org"
   LANGUAGES C CXX

diff --git a/NEWS b/NEWS
@@ -1,6 +1,12 @@
 MLT Release Notes
 -----------------
 
+Version 6.26.1
+
+This version fixes a major regression in the avformat producer to read from
+network URLs.
+
+
 Version 6.26.0
 
 This is the last planned release of major version 6. Version 7 will be released

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=6.26.0
+export version=6.26.1
 export soversion=6
 
 show_help()

diff --git a/docs/melt.1 b/docs/melt.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.4.
-.TH MELT "1" "April 2021" "melt 6.26.0" "User Commands"
+.TH MELT "1" "April 2021" "melt 6.26.1" "User Commands"
 .SH NAME
 melt \- author, play, and encode multitrack audio/video compositions
 .SH SYNOPSIS

diff --git a/src/framework/mlt_version.h b/src/framework/mlt_version.h
@@ -28,7 +28,7 @@
 
 #define LIBMLT_VERSION_MAJOR    6
 #define LIBMLT_VERSION_MINOR    26
-#define LIBMLT_VERSION_REVISION 0
+#define LIBMLT_VERSION_REVISION 1
 #define LIBMLT_VERSION_INT      ((LIBMLT_VERSION_MAJOR<<16)+(LIBMLT_VERSION_MINOR<<8)+LIBMLT_VERSION_REVISION)
 #define LIBMLT_VERSION          MLT_STRINGIZE(LIBMLT_VERSION_MAJOR.LIBMLT_VERSION_MINOR.LIBMLT_VERSION_REVISION)
 

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
@@ -544,7 +544,7 @@ static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **fo
 	char *url = strchr( protocol, ':' );
 
 	// Truncate protocol string
-	if (url && url - protocol > 1) { // if defined and not a drive letter
+	if (url && (url - protocol) > 1 && avio_check(URL, 0) < 0) { // if defined and not a drive letter
 		url[0] = '\0';
 		++url;
 		mlt_log_debug( NULL, "%s: protocol=%s resource=%s\n", __FUNCTION__, protocol, url );