From fb48c25076e5cd918db44c5147901d0ec3cec323 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Sun, 3 Mar 2019 19:34:57 +0100 Subject: [PATCH] alloca, tsearch-tests: Write NULL for the null pointer. * lib/alloca.c (i00afunc): Write NULL instead of 0. * tests/test-tsearch.c (mangle_tree): Likewise. --- ChangeLog | 6 ++++++ lib/alloca.c | 10 +++++----- tests/test-tsearch.c | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1583dca58..bfb9ffc208 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-02-28 Michal Privoznik + + alloca, tsearch-tests: Write NULL for the null pointer. + * lib/alloca.c (i00afunc): Write NULL instead of 0. + * tests/test-tsearch.c (mangle_tree): Likewise. + 2019-03-09 Bruno Haible strfmon_l: Fix -fsanitize=address finding. diff --git a/lib/alloca.c b/lib/alloca.c index ee0f018868..d0476d53e6 100644 --- a/lib/alloca.c +++ b/lib/alloca.c @@ -350,16 +350,16 @@ i00afunc (long *address) /* There must be at least one stack segment. Therefore it is a fatal error if "trailer" is null. */ - if (trailer == 0) + if (trailer == NULL) abort (); /* Discard segments that do not contain our argument address. */ - while (trailer != 0) + while (trailer != NULL) { block = (long *) trailer->this_address; size = trailer->this_size; - if (block == 0 || size == 0) + if (block == NULL || size == 0) abort (); trailer = (struct stk_trailer *) trailer->link; if ((block <= address) && (address < (block + size))) @@ -371,7 +371,7 @@ i00afunc (long *address) result = address - block; - if (trailer == 0) + if (trailer == NULL) { return result; } @@ -383,7 +383,7 @@ i00afunc (long *address) result += trailer->this_size; trailer = (struct stk_trailer *) trailer->link; } - while (trailer != 0); + while (trailer != NULL); /* We are done. Note that if you present a bogus address (one not in any segment), you will get a different number back, formed diff --git a/tests/test-tsearch.c b/tests/test-tsearch.c index 808a827003..2d0e794bbe 100644 --- a/tests/test-tsearch.c +++ b/tests/test-tsearch.c @@ -223,7 +223,7 @@ mangle_tree (enum order how, enum action what, void **root, int lag) error = 1; } elem = tsearch (x + j, root, cmp_fn); - if (elem == 0 + if (elem == NULL || tfind (x + j, (void *const *) root, cmp_fn) == NULL) { fputs ("Couldn't find element after it was added.\n", -- 2.39.5