On 2021-12-07 05:39 pm, James Almer wrote:


On 12/7/2021 9:00 AM, Gyan Doshi wrote:
The concatf protocol returns an opaque error on open if
concatf list file contains trailing newlines.
---
  libavformat/concat.c | 4 ++++
  1 file changed, 4 insertions(+)

diff --git a/libavformat/concat.c b/libavformat/concat.c
index 2560811ff9..faeba2293a 100644
--- a/libavformat/concat.c
+++ b/libavformat/concat.c
@@ -245,6 +245,10 @@ static av_cold int concatf_open(URLContext *h, const char *uri, int flags)
          char *node_uri;
          int64_t size;
          size_t len = i;
+        int leading_spaces = strspn(cursor, " \n\t\r");
+
+        if (!cursor[leading_spaces])
+            break;
            node_uri = av_get_token(&cursor, "\r\n");
          if (!node_uri) {

Seems to work, so LGTM.

Thanks.

Pushed as a454dfacd560e40fa5fea796f0d5b437f78e54e4

Gyan
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Reply via email to