X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftal%2Ftest%2Frun-overflow.c;h=d975398b4ba39b9e55ef35a57b18537aa514bbc8;hp=473ba70a11b775160c88a3af8ee43291572955a9;hb=e81b527384ad5331a9cd35a9f21bc8ac6b16d137;hpb=d61a0d6c2c9d2b385075338665d64ae1d1bbe3dc diff --git a/ccan/tal/test/run-overflow.c b/ccan/tal/test/run-overflow.c index 473ba70a..d975398b 100644 --- a/ccan/tal/test/run-overflow.c +++ b/ccan/tal/test/run-overflow.c @@ -32,42 +32,42 @@ int main(void) origpi = tal_arr(NULL, int, 100); ok1(origpi); ok1(error_count == 0); - pi = tal_dup(NULL, int, origpi, (size_t)-1, 0); + pi = tal_dup_arr(NULL, int, origpi, (size_t)-1, 0); ok1(!pi); ok1(error_count == 1); - pi = tal_dup(NULL, int, origpi, 0, (size_t)-1); + pi = tal_dup_arr(NULL, int, origpi, 0, (size_t)-1); ok1(!pi); ok1(error_count == 2); - pi = tal_dup(NULL, int, origpi, (size_t)-1UL / sizeof(int), + pi = tal_dup_arr(NULL, int, origpi, (size_t)-1UL / sizeof(int), (size_t)-1UL / sizeof(int)); ok1(!pi); ok1(error_count == 3); /* This will still overflow when tal_hdr is added. */ - pi = tal_dup(NULL, int, origpi, (size_t)-1UL / sizeof(int) / 2, + pi = tal_dup_arr(NULL, int, origpi, (size_t)-1UL / sizeof(int) / 2, (size_t)-1UL / sizeof(int) / 2); ok1(!pi); ok1(error_count == 4); - ok1(tal_first(NULL) == origpi && !tal_next(NULL, origpi)); + ok1(tal_first(NULL) == origpi && !tal_next(origpi) && !tal_first(origpi)); tal_free(origpi); /* Now, check that with taltk() we free old one on failure. */ origpi = tal_arr(NULL, int, 100); error_count = 0; - pi = tal_dup(NULL, int, take(origpi), (size_t)-1, 0); + pi = tal_dup_arr(NULL, int, take(origpi), (size_t)-1, 0); ok1(!pi); ok1(error_count == 1); origpi = tal_arr(NULL, int, 100); error_count = 0; - pi = tal_dup(NULL, int, take(origpi), 0, (size_t)-1); + pi = tal_dup_arr(NULL, int, take(origpi), 0, (size_t)-1); ok1(!pi); ok1(error_count == 1); ok1(!tal_first(NULL)); origpi = tal_arr(NULL, int, 100); error_count = 0; - pi = tal_dup(NULL, int, take(origpi), (size_t)-1UL / sizeof(int), + pi = tal_dup_arr(NULL, int, take(origpi), (size_t)-1UL / sizeof(int), (size_t)-1UL / sizeof(int)); ok1(!pi); ok1(error_count == 1); @@ -76,7 +76,7 @@ int main(void) origpi = tal_arr(NULL, int, 100); error_count = 0; /* This will still overflow when tal_hdr is added. */ - pi = tal_dup(NULL, int, take(origpi), (size_t)-1UL / sizeof(int) / 2, + pi = tal_dup_arr(NULL, int, take(origpi), (size_t)-1UL / sizeof(int) / 2, (size_t)-1UL / sizeof(int) / 2); ok1(!pi); ok1(error_count == 1);