kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

Merge pull request #13034 from MyCodeMyMoney/master

Browse Source 
core/ringbuffer: compensate 'ringbuffer_remove' underflow error
This commit is contained in:
Francisco 2020-01-07 13:39:47 +01:00 committed by GitHub
commit 56ed36f3e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ringbuffer.c
View File

@ -121,7 +121,7 @@ unsigned ringbuffer_remove(ringbuffer_t *restrict rb, unsigned n)
rb->avail -= n;
/* compensate underflow */
if (rb->start > rb->size) {
if (rb->start >= rb->size) {
rb->start -= rb->size;
}
}

22
tests/unittests/tests-core/tests-core-ringbuffer.c
View File

@ -131,11 +131,33 @@ static void tests_core_ringbuffer_remove(void)
}
static void tests_core_ringbuffer_remove_underflow(void)
{
char mem[3];
ringbuffer_t buf;
ringbuffer_init(&buf, mem, sizeof(mem));
ringbuffer_add_one(&buf, 0);
ringbuffer_add_one(&buf, 1);
ringbuffer_remove(&buf, 2);
TEST_ASSERT_EQUAL_INT(1, ringbuffer_empty(&buf));
ringbuffer_add_one(&buf, 0);
ringbuffer_add_one(&buf, 1);
ringbuffer_remove(&buf,1);
TEST_ASSERT_EQUAL_INT(1, ringbuffer_get_one(&buf));
TEST_ASSERT_EQUAL_INT(1, ringbuffer_empty(&buf));
}
Test *tests_core_ringbuffer_tests(void)
{
EMB_UNIT_TESTFIXTURES(fixtures) {
new_TestFixture(tests_core_ringbuffer),
new_TestFixture(tests_core_ringbuffer_remove),
new_TestFixture(tests_core_ringbuffer_remove_underflow),
};
EMB_UNIT_TESTCALLER(ringbuffer_tests, NULL, NULL, fixtures);