Commit 89d7f003 by Nathan Sidwell

frame.c (end_fde_sort): Remove extraneous erratic array test.

	* frame.c (end_fde_sort): Remove extraneous erratic array test.

	* frame.c (start_fde_sort): Don't malloc (0).

From-SVN: r34452
parent 68c8e13e
2000-06-08 Nathan Sidwell <nathan@codesourcery.com>
* frame.c (end_fde_sort): Remove extraneous erratic array test.
2000-06-08 Denis Perchine <dyp@perchine.com>
* frame.c (start_fde_sort): Don't malloc (0).
2000-06-07 Zack Weinberg <zack@wolery.cumb.org> 2000-06-07 Zack Weinberg <zack@wolery.cumb.org>
* c-decl.c (pushdecl): Do not call COMPLETE_TYPE_P on * c-decl.c (pushdecl): Do not call COMPLETE_TYPE_P on
......
...@@ -59,7 +59,7 @@ typedef struct fde_accumulator ...@@ -59,7 +59,7 @@ typedef struct fde_accumulator
static inline int static inline int
start_fde_sort (fde_accumulator *accu, size_t count) start_fde_sort (fde_accumulator *accu, size_t count)
{ {
accu->linear.array = (fde **) malloc (sizeof (fde *) * count); accu->linear.array = count ? (fde **) malloc (sizeof (fde *) * count) : NULL;
accu->erratic.array = accu->linear.array ? accu->erratic.array = accu->linear.array ?
(fde **) malloc (sizeof (fde *) * count) : NULL; (fde **) malloc (sizeof (fde *) * count) : NULL;
accu->linear.count = 0; accu->linear.count = 0;
...@@ -230,8 +230,7 @@ end_fde_sort (fde_accumulator *accu, size_t count) ...@@ -230,8 +230,7 @@ end_fde_sort (fde_accumulator *accu, size_t count)
abort (); abort ();
frame_heapsort (&accu->erratic); frame_heapsort (&accu->erratic);
fde_merge (&accu->linear, &accu->erratic); fde_merge (&accu->linear, &accu->erratic);
if (accu->erratic.array) free (accu->erratic.array);
free (accu->erratic.array);
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment