Skip to content

V
vlc
Commit e1588d2c authored by Steve Lhomme's avatar Steve Lhomme Committed by Rémi Denis-Courmont
Browse files
Options

prefetch: don't do anything when reading 0 bytes 

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent ccd6ba5d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
modules/stream_filter/prefetch.c
View file @ e1588d2c
...@@ -307,6 +307,8 @@ static ssize_t Read(stream_t *stream, void *buf, size_t buflen) ...@@ -307,6 +307,8 @@ static ssize_t Read(stream_t *stream, void *buf, size_t buflen)
size_t copy; size_t copy;
bool eof; bool eof;
if (buflen == 0)
return buflen;
if (buf == NULL) if (buf == NULL)
{ {
Seek(stream, sys->stream_offset + buflen); Seek(stream, sys->stream_offset + buflen);
...@@ -339,12 +341,9 @@ static ssize_t Read(stream_t *stream, void *buf, size_t buflen) ...@@ -339,12 +341,9 @@ static ssize_t Read(stream_t *stream, void *buf, size_t buflen)
char *p = sys->buffer + (sys->stream_offset % sys->buffer_size); char *p = sys->buffer + (sys->stream_offset % sys->buffer_size);
if (copy > buflen) if (copy > buflen)
copy = buflen; copy = buflen;
if (copy > 0) memcpy(buf, p, copy);
{ sys->stream_offset += copy;
memcpy(buf, p, copy); vlc_cond_signal(&sys->wait_space);
sys->stream_offset += copy;
vlc_cond_signal(&sys->wait_space);
}
vlc_mutex_unlock(&sys->lock); vlc_mutex_unlock(&sys->lock);
return copy; return copy;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment