failtest: fix internal cut & paste bug
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 29 Nov 2011 22:30:11 +0000 (09:00 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 29 Nov 2011 22:30:11 +0000 (09:00 +1030)
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

index f79768d87877f3ff7c8d6a3865842c0a3ee85ceb..c95a94f8d0ce4968dfe9266a47a68343c96b2fa9 100644 (file)
@@ -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)