diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-08 08:30:28 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-06-08 08:30:28 +0000 |
| commit | d640ac76f398bdd41d5791c9c8079cd56bf9e9ff (patch) | |
| tree | bdea4eba48a082d99bdb2d830d19c8b50a655152 | |
| parent | 94590fe3323cb81bcc8d4dc2aced626de0519aaa (diff) | |
| download | ppe42-gcc-d640ac76f398bdd41d5791c9c8079cd56bf9e9ff.tar.gz ppe42-gcc-d640ac76f398bdd41d5791c9c8079cd56bf9e9ff.zip | |
* frame.c (end_fde_sort): Remove extraneous erratic array test.
* frame.c (start_fde_sort): Don't malloc (0).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34452 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/frame.c | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e129114d1e2..51e6599575d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +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> * c-decl.c (pushdecl): Do not call COMPLETE_TYPE_P on diff --git a/gcc/frame.c b/gcc/frame.c index e1448e315f0..399df577ff0 100644 --- a/gcc/frame.c +++ b/gcc/frame.c @@ -59,7 +59,7 @@ typedef struct fde_accumulator static inline int 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 ? (fde **) malloc (sizeof (fde *) * count) : NULL; accu->linear.count = 0; @@ -230,8 +230,7 @@ end_fde_sort (fde_accumulator *accu, size_t count) abort (); frame_heapsort (&accu->erratic); fde_merge (&accu->linear, &accu->erratic); - if (accu->erratic.array) - free (accu->erratic.array); + free (accu->erratic.array); } else { |
