len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

buffering: Fix a case that could allow widx to fully wrap to ridx and overflow the ringbuffer.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29257 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-02-09 08:44:37 +00:00
parent 06023f3110
commit 19ea72ff63
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/buffering.c
View file

@ -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);