summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-07-13 10:25:39 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-07-13 10:25:39 +0200
commit9d9bcfa4f3fdb157ac85c29b9a7024ca9b0bddf8 (patch)
tree096206c061b1f234589ae44709ba0428a054ad08
parentdc4dcf34e5a1c8e05e2c6667a0fe7a5bdb0ace7e (diff)
downloadmpv-9d9bcfa4f3fdb157ac85c29b9a7024ca9b0bddf8.tar.bz2
mpv-9d9bcfa4f3fdb157ac85c29b9a7024ca9b0bddf8.tar.xz
mp_ring: make mp_ring_read_cb provide an exact amount of bytes
The previous code would pass down `len` instead of `read_len` which, in theory, could be more than what was available in the buffer.
-rw-r--r--core/mp_ring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/mp_ring.c b/core/mp_ring.c
index 207dc62e86..bd94870710 100644
--- a/core/mp_ring.c
+++ b/core/mp_ring.c
@@ -99,7 +99,7 @@ int mp_ring_read_cb(struct mp_ring *buffer, void *ctx, int len,
int read_len = FFMIN(len, buffered);
int read_ptr = mp_ring_get_rpos(buffer) % size;
- func(ctx, buffer->buffer + read_ptr, len);
+ func(ctx, buffer->buffer + read_ptr, read_len);
return mp_ring_drain(buffer, read_len);
}