From d2a75837ccaa3b0da996969674b631dc3f778838 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Sat, 14 Jan 2012 18:58:49 -0300 Subject: [PATCH] Avoid NULL pointer dereference in isolationtester --- src/test/isolation/isolationtester.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c index 1d339e9c57..b35e533b66 100644 --- a/src/test/isolation/isolationtester.c +++ b/src/test/isolation/isolationtester.c @@ -406,14 +406,16 @@ run_named_permutations(TestSpec * testspec) /* Find all the named steps from the lookup table */ for (j = 0; j < p->nsteps; j++) { - steps[j] = *((Step **) bsearch(p->stepnames[j], allsteps, nallsteps, - sizeof(Step *), &step_bsearch_cmp)); - if (steps[j] == NULL) + Step **this = (Step **) bsearch(p->stepnames[j], allsteps, + nallsteps, sizeof(Step *), + &step_bsearch_cmp); + if (this == NULL) { fprintf(stderr, "undefined step \"%s\" specified in permutation\n", p->stepnames[j]); exit_nicely(); } + steps[j] = *this; } run_permutation(testspec, p->nsteps, steps); -- 2.40.0