From 407057edd6b45cae437d119df80ff080989a2752 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 30 Nov 2011 09:00:11 +1030 Subject: [PATCH 1/1] failtest: fix internal cut & paste bug failtest_malloc should use p->u.malloc not p->u.calloc. The layouts are identical, so it doesn't matter, but it's confusing and leaves us open to weird bugs in future should one change. --- ccan/failtest/failtest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ccan/failtest/failtest.c b/ccan/failtest/failtest.c index f79768d8..c95a94f8 100644 --- a/ccan/failtest/failtest.c +++ b/ccan/failtest/failtest.c @@ -603,14 +603,14 @@ void *failtest_malloc(size_t size, const char *file, unsigned line) p = add_history(FAILTEST_MALLOC, file, line, &call); if (should_fail(p)) { - p->u.calloc.ret = NULL; + p->u.malloc.ret = NULL; p->error = ENOMEM; } else { - p->u.calloc.ret = malloc(size); + p->u.malloc.ret = malloc(size); set_cleanup(p, cleanup_malloc, struct malloc_call); } errno = p->error; - return p->u.calloc.ret; + return p->u.malloc.ret; } static void cleanup_realloc(struct realloc_call *call) -- 2.39.2