Skip to content

ringbuffer: fix rb_get_bytes_used (modulo overflow) #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ringbuffer: fix rb_get_bytes_used (modulo overflow) #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ringbuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ int rb_init(struct ringbuffer_t *rb)

int rb_get_bytes_used(struct ringbuffer_t* rb)
{
return((rb->tail - rb->head) % sizeof(rb->buf));
if (rb->tail >= rb->head)
return (rb->tail - rb->head);
else
return (rb->tail - rb->head) + sizeof(rb->buf);
}

int rb_read(struct ringbuffer_t *rb, uint8_t* buf, int count)
Expand Down Expand Up @@ -81,7 +84,7 @@ int rb_write(struct ringbuffer_t *rb, uint8_t* buf, int count)
{
int to_copy;

int bytes_used = (rb->tail - rb->head) % sizeof(rb->buf);
int bytes_used = rb_get_bytes_used(rb);
//fprintf(stderr,"bytes_used = %d\n",bytes_used);

if (bytes_used + count >= (int)sizeof(rb->buf)) {
Expand Down