RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

stream: disallow reading or writing to directories 

Reading an entire file is a common operation, meanwhile
stream_file will happily open a directory. This doesn't match well.

Analogously for open_output_stream().
This commit is contained in:
sfan5 2024-05-13 21:27:54 +02:00
parent 7a93a584fc
commit ae23556b6f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stream/stream.c
View File

@ -471,8 +471,13 @@ struct stream *stream_create(const char *url, int flags,
stream_t *open_output_stream(const char *filename, struct mpv_global *global) stream_t *open_output_stream(const char *filename, struct mpv_global *global)
{ {
return stream_create(filename, STREAM_ORIGIN_DIRECT | STREAM_WRITE, struct stream *s = stream_create(filename, STREAM_ORIGIN_DIRECT | STREAM_WRITE,
NULL, global); NULL, global);
if (s && s->is_directory) {
free_stream(s);
s = NULL;
}
return s;
} }
// Read function bypassing the local stream buffer. This will not write into // Read function bypassing the local stream buffer. This will not write into
@ -804,6 +809,8 @@ struct bstr stream_read_complete(struct stream *s, void *talloc_ctx,
{ {
if (max_size <= 0 || max_size > STREAM_MAX_READ_SIZE) if (max_size <= 0 || max_size > STREAM_MAX_READ_SIZE)
abort(); abort();
if (s->is_directory)
return (struct bstr){NULL, 0};
int bufsize; int bufsize;
int total_read = 0; int total_read = 0;