tal: add tal_expand().

[ccan] / ccan / tal / test / run-overflow.c

diff --git a/ccan/tal/test/run-overflow.c b/ccan/tal/test/run-overflow.c
index dedeba3d112ee2195c07a512b05338f1438a3f25..c5daf97d2794b99966dd59e959cdab7d649be87f 100644 (file)
--- a/ccan/tal/test/run-overflow.c
+++ b/ccan/tal/test/run-overflow.c
@@ -7,14 +7,15 @@ static int error_count;
 static void my_error(const char *msg)
 {
        error_count++;
-       ok1(strstr(msg, "overflow"));
 }
 
 int main(void)
 {
        void *p;
+       int *pi, *origpi;
+       char *cp;
 
-       plan_tests(6);
+       plan_tests(30);
 
        tal_set_backend(NULL, NULL, NULL, my_error);
 
@@ -25,5 +26,73 @@ int main(void)
        p = tal_arr(NULL, char, (size_t)-2);
        ok1(!p);
        ok1(error_count == 2);
+
+       /* Now try overflow cases for tal_dup. */
+       error_count = 0;
+       origpi = tal_arr(NULL, int, 100);
+       ok1(origpi);
+       ok1(error_count == 0);
+       pi = tal_dup(NULL, int, origpi, (size_t)-1, 0);
+       ok1(!pi);
+       ok1(error_count == 1);
+       pi = tal_dup(NULL, int, origpi, 0, (size_t)-1);
+       ok1(!pi);
+       ok1(error_count == 2);
+
+       pi = tal_dup(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,
+                    (size_t)-1UL / sizeof(int) / 2);
+       ok1(!pi);
+       ok1(error_count == 4);
+       ok1(tal_first(NULL) == origpi && !tal_next(NULL, 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);
+       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);
+       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),
+                    (size_t)-1UL / sizeof(int));
+       ok1(!pi);
+       ok1(error_count == 1);
+       ok1(!tal_first(NULL));
+
+       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,
+                    (size_t)-1UL / sizeof(int) / 2);
+       ok1(!pi);
+       ok1(error_count == 1);
+       ok1(!tal_first(NULL));
+
+       /* Overflow on expand addition. */
+       cp = tal_arr(p, char, 100);
+       ok1(!tal_expand(&cp, NULL, (size_t)-99UL));
+       ok1(error_count == 2);
+       tal_free(cp);
+
+       /* Overflow when multiplied by size */
+       origpi = tal_arr(NULL, int, 100);
+       ok1(!tal_expand(&origpi, NULL, (size_t)-1UL / sizeof(int)));
+       ok1(error_count == 3);
+       tal_free(origpi);
+
        return exit_status();
 }