openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

tests: Wrap strdup to help cmocka recognise memory allocation

Browse Source 
This is a known issue in cmocka (see
https://github.com/clibs/cmocka/issues/17) where cmocka does not
recognise memory allocation happening inside strdup, and then later
throws an error when the memory is freed. If the issue is fixed at
some point, this workaround can be removed.

Given that cmocka already overrides malloc, calloc, realloc, free,
adding strdup there seems fine.

Existing tests now can (and have to) free the memory they allocated
by strdup, and this is in the same patch.

BUG=b:193584590
TEST=ninja test

Change-Id: I56aef6b342752d80995c36ab075b12198fc101d9
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/56323
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Anastasia Klimchuk 2021-07-15 10:00:20 +10:00 committed by Edward O'Callaghan
parent 02bc0b2c53
commit 80c3296499
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/init_shutdown.c
View File

@ -23,13 +23,17 @@ static void run_lifecycle(void **state, const struct programmer_entry *prog, con
{
(void) state; /* unused */
char *param_dup = strdup(param);
printf("Testing programmer_init for programmer=%s ...\n", prog->name);
assert_int_equal(0, programmer_init(prog, strdup(param)));
assert_int_equal(0, programmer_init(prog, param_dup));
printf("... programmer_init for programmer=%s successful\n", prog->name);
printf("Testing programmer_shutdown for programmer=%s ...\n", prog->name);
assert_int_equal(0, programmer_shutdown());
printf("... programmer_shutdown for programmer=%s successful\n", prog->name);
free(param_dup);
}
void dummy_init_and_shutdown_test_success(void **state)

1
tests/meson.build
View File

@ -22,6 +22,7 @@ srcs = [
]
mocks = [
'-Wl,--wrap=strdup',
'-Wl,--wrap=physunmap',
'-Wl,--wrap=physmap',
'-Wl,--wrap=spi_send_command',

11
tests/tests.c
View File

@ -18,6 +18,7 @@
#include "tests.h"
#include <stdio.h>
#include <string.h>
#include <stdint.h>
/* redefinitions/wrapping */
@ -31,6 +32,16 @@ void io_mock_register(const struct io_mock *io)
current_io = io;
}
/* Workaround for https://github.com/clibs/cmocka/issues/17 */
char *__wrap_strdup(const char *s)
{
size_t len = strlen(s) + 1;
void *new = malloc(len);
if (new == NULL)
return NULL;
return (char *)memcpy(new, s, len);
}
void __wrap_physunmap(void *virt_addr, size_t len)
{
LOG_ME;