riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

memarray: fix memarray init

Browse Source 
If memarray data is not initialized to 0 (for instance during a
re-init). The last element of the array is not properly cleared thus
leading to returning an invalid pointer when everything is allocated.
This commit is contained in:
Vincent Dupont 2020-03-04 16:35:38 +01:00
parent 26f3caf9d7
commit 97cfd1e512
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/memarray/memarray.c
View File

@ -28,6 +28,7 @@ void memarray_init(memarray_t *mem, void *data, size_t size, size_t num)
void *next = ((char *)mem->free_data) + ((i + 1) * mem->size); void *next = ((char *)mem->free_data) + ((i + 1) * mem->size);
memcpy(((char *)mem->free_data) + (i * mem->size), &next, sizeof(void *)); memcpy(((char *)mem->free_data) + (i * mem->size), &next, sizeof(void *));
} }
memset(((char *)mem->free_data) + ((mem->num - 1) * (mem->size)), 0, sizeof(void *));
} }
void *memarray_alloc(memarray_t *mem) void *memarray_alloc(memarray_t *mem)

22
tests/memarray/main.c
View File

@ -35,6 +35,11 @@
#define NUMBER_OF_TESTS (12) #define NUMBER_OF_TESTS (12)
#endif #endif
#ifndef NUMBER_OF_LOOPS
#define NUMBER_OF_LOOPS (2)
#endif
extern int _ps_handler(int argc, char **argv); extern int _ps_handler(int argc, char **argv);
struct block_t { struct block_t {
@ -101,15 +106,32 @@ void free_memory(struct block_t *head)
int main(void) int main(void)
{ {
printf("MAX_NUMBER_BLOCKS: %d\n", MAX_NUMBER_BLOCKS); printf("MAX_NUMBER_BLOCKS: %d\n", MAX_NUMBER_BLOCKS);
printf("NUMBER_OF_LOOPS: %d\n", NUMBER_OF_LOOPS);
printf("NUMBER_OF_TESTS: %d\n", NUMBER_OF_TESTS); printf("NUMBER_OF_TESTS: %d\n", NUMBER_OF_TESTS);
memory_block_init(); memory_block_init();
int count = 0; int count = 0;
int loop = 0;
printf("Starting (%d, %u)\n", MAX_NUMBER_BLOCKS, MESSAGE_SIZE); printf("Starting (%d, %u)\n", MAX_NUMBER_BLOCKS, MESSAGE_SIZE);
_ps_handler(0, NULL); _ps_handler(0, NULL);
printf("LOOP #%i:\n", loop + 1);
while (count < NUMBER_OF_TESTS) {
struct block_t *head = (struct block_t *) memarray_alloc(&block_storage);
printf("TEST #%i:\n", count + 1 );
fill_memory(head);
free_memory(head);
count++;
}
count = 0;
loop++;
printf("LOOP #%i:\n", loop + 1);
while (count < NUMBER_OF_TESTS) { while (count < NUMBER_OF_TESTS) {
memory_block_init();
struct block_t *head = (struct block_t *) memarray_alloc(&block_storage); struct block_t *head = (struct block_t *) memarray_alloc(&block_storage);
printf("TEST #%i:\n", count + 1 ); printf("TEST #%i:\n", count + 1 );

20
tests/memarray/tests/01-run.py
View File

@ -13,16 +13,20 @@ from testrunner import run
def testfunc(child): def testfunc(child):
child.expect(r'MAX_NUMBER_BLOCKS: (\d+)\r\n') child.expect(r'MAX_NUMBER_BLOCKS: (\d+)\r\n')
max_number_blocks = int(child.match.group(1)) max_number_blocks = int(child.match.group(1))
child.expect(r'NUMBER_OF_LOOPS: (\d+)\r\n')
number_of_loops = int(child.match.group(1))
child.expect(r'NUMBER_OF_TESTS: (\d+)\r\n') child.expect(r'NUMBER_OF_TESTS: (\d+)\r\n')
number_of_tests = int(child.match.group(1)) number_of_tests = int(child.match.group(1))
for test in range(number_of_tests): for loop in range(number_of_loops):
child.expect_exact("TEST #{}:".format(test + 1)) child.expect_exact("LOOP #{}:".format(loop + 1))
for i in range(max_number_blocks): for test in range(number_of_tests):
child.expect(r'\({}, @@@@@@@\) Allocated \d+ Bytes at 0x[a-z0-9]+,' child.expect_exact("TEST #{}:".format(test + 1))
r' total [0-9]+\r\n'.format(i)) for i in range(max_number_blocks):
for i in range(max_number_blocks): child.expect(r'\({}, @@@@@@@\) Allocated \d+ Bytes at 0x[a-z0-9]+,'
child.expect(r'Free \({}\) \d+ Bytes at 0x[a-z0-9]+,' r' total [0-9]+\r\n'.format(i))
' total [0-9]+\r\n'.format(i)) for i in range(max_number_blocks):
child.expect(r'Free \({}\) \d+ Bytes at 0x[a-z0-9]+,'
' total [0-9]+\r\n'.format(i))
child.expect_exact("Finishing") child.expect_exact("Finishing")