Avoid NULL pointer dereference in isolationtester

alvherre · alvherre · commit d2a75837ccaa · 2012-01-14T19:01:32.000-03:00
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -406,14 +406,16 @@ run_named_permutations(TestSpec * testspec)`
`406`	`406`	`/* Find all the named steps from the lookup table */`
`407`	`407`	`for (j = 0; j < p->nsteps; j++)`
`408`	`408`	`{`
`409`		`- steps[j] = ((Step *) bsearch(p->stepnames[j], allsteps, nallsteps,`
`410`		`- sizeof(Step *), &step_bsearch_cmp));`
`411`		`- if (steps[j] == NULL)`
	`409`	`+ Step this = (Step ) bsearch(p->stepnames[j], allsteps,`
	`410`	`+ nallsteps, sizeof(Step *),`
	`411`	`+ &step_bsearch_cmp);`
	`412`	`+ if (this == NULL)`
`412`	`413`	`{`
`413`	`414`	`fprintf(stderr, "undefined step \"%s\" specified in permutation\n",`
`414`	`415`	`p->stepnames[j]);`
`415`	`416`	`exit_nicely();`
`416`	`417`	`}`
	`418`	`+ steps[j] = *this;`
`417`	`419`	`}`
`418`	`420`
`419`	`421`	`run_permutation(testspec, p->nsteps, steps);`