RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/file: fail for non-numerical arguments to pipe: 

Before this patch, the implementation of pipe: inputs/outputs would
silently fall back to stdin/stdout for any argument not successfully
parsed by strtol().

This patch introduces an explicit error for any non-numerical arguments,
which should avoid user confusion as in #10977.

New behavior:

$ cat /tmp/video.mkv | ./ffmpeg -i pipe:aa -acodec copy -vcodec copy -f matroska pipe:1 | cat >/tmp/out.mkv

[pipe @ 0x5618c7bcf740] Non-numerical argument "aa" to pipe:
[in#0 @ 0x5618c7bced00] Error opening input: Invalid argument
Error opening input file pipe:aa.
Error opening input files: Invalid argument

Based on the patch of Nils Goroll <nils.goroll@uplex.de>.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2024-05-05 21:31:47 +02:00
parent 39ce8a9695
commit 8d92f59d11
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/file.c
View File

@ -442,13 +442,16 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
if (c->fd < 0) { if (c->fd < 0) {
av_strstart(filename, "pipe:", &filename); av_strstart(filename, "pipe:", &filename);
fd = strtol(filename, &final, 10); if (!*filename) {
if((filename == final) || *final ) {/* No digits found, or something like 10ab */
if (flags & AVIO_FLAG_WRITE) { if (flags & AVIO_FLAG_WRITE) {
fd = 1; fd = 1;
} else { } else {
fd = 0; fd = 0;
} }
} else {
fd = strtol(filename, &final, 10);
if (*final) /* No digits found, or something like 10ab */
return AVERROR(EINVAL);
} }
c->fd = fd; c->fd = fd;
} }