diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2011-02-09 08:44:37 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2011-02-09 08:44:37 +0000 |
| commit | 19ea72ff63744c51292cd1d2d1c2792b009892aa (patch) | |
| tree | 5b76b74b1402050dc6569d5763f5500270067e5e /apps/buffering.c | |
| parent | 06023f311003ba5b357c1132895afc829dff43d4 (diff) | |
buffering: Fix a case that could allow widx to fully wrap to ridx and overflow the ringbuffer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29257 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/buffering.c')
| -rw-r--r-- | apps/buffering.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 8d41324190..e37b053881 100644 --- a/apps/buffering.c +++ b/apps/buffering.c @@ -254,7 +254,7 @@ static struct memory_handle *add_handle(size_t data_size, bool can_wrap, size_t shift; size_t new_widx; size_t len; - int overlap; + ssize_t overlap; if (num_handles >= BUF_MAX_HANDLES) return NULL; @@ -296,7 +296,7 @@ static struct memory_handle *add_handle(size_t data_size, bool can_wrap, /* How much space are we short in the actual ring buffer? */ overlap = ringbuf_add_cross(buf_widx, shift + len, buf_ridx); - if (overlap >= 0 && (alloc_all || (unsigned)overlap > data_size)) { + if (overlap >= 0 && (alloc_all || (size_t)overlap >= data_size)) { /* Not enough space for required allocations */ mutex_unlock(&llist_mod_mutex); mutex_unlock(&llist_mutex); |