aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 07:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightning-cli: use tal_arr for toks again.

Browse Source 
We moved to raw malloc to detect OOM, but json_tok_remove wants a tal
array.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-07-26 11:53:44 +09:30
parent 3c3a89c483
commit 7e97119117
2 changed files with 20 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cli/test/run-large-input.c
View File

@@ -14,9 +14,6 @@ int test_connect(int sockfd, const struct sockaddr *addr,
socklen_t addrlen);
int test_getpid(void);
int test_printf(const char *format, ...);
void *test_malloc(size_t n);
void *test_realloc(void *p, size_t n);
void test_free(void *p);
#define main test_main
#define read test_read
@@ -24,9 +21,6 @@ void test_free(void *p);
#define connect test_connect
#define getpid test_getpid
#define printf test_printf
#define malloc test_malloc
#define realloc test_realloc
#define free test_free
#include "../lightning-cli.c"
#undef main
@@ -62,22 +56,6 @@ int test_printf(const char *fmt UNUSED, ...)
static char *response;
static size_t response_off, max_read_return;
void *test_malloc(size_t n)
{
return tal_arr(response, u8, n);
}
void *test_realloc(void *p, size_t n)
{
tal_resize(&p, n);
return p;
}
void test_free(void *p)
{
tal_free(p);
}
ssize_t test_read(int fd UNUSED, void *buf, size_t len)
{
if (len > max_read_return)