videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Merge branch 'stream-read' into 'master' 

vlc_stream: cleanup error handling in vlc_stream_Read()

See merge request videolan/vlc!2138
This commit is contained in:
Steve Lhomme 2024-04-28 07:10:59 +00:00
parent 7d6abadd24 cbf059c660
commit 742e670530
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/input/stream.c
View File

@ -513,9 +513,20 @@ ssize_t vlc_stream_Read(stream_t *s, void *buf, size_t len)
while (len > 0)
{
ssize_t ret = vlc_stream_ReadPartial(s, buf, len);
size_t to_read;
if (unlikely(len > SSIZE_MAX))
to_read = SSIZE_MAX;
else
to_read = len;
ssize_t ret = vlc_stream_ReadPartial(s, buf, to_read);
if (ret < 0)
continue;
{
if (vlc_killed())
break;
if (errno == EINTR || errno == EAGAIN)
continue;
break;
}
if (ret == 0)
break;