Changeset 1998

Timestamp:

Jun 5, 2005, 6:17:00 PM (20 years ago)

Author:

bird

Message:

Avoid alloc() since we might easily run out of stack for string tables and such like.

File:

• trunk/src/emx/src/ld/ld.c (modified) (20 diffs, 1 prop)

trunk/src/emx/src/ld/ld.c

@@ -63 +63 @@
 
 /* If compiled with GNU C, use the built-in alloca */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# include "alloca.h"
-#endif
-
+#include "alloca.h"
 #include "getopt.h"
 
@@ -1957 +1952 @@
     {
       read_entry_symbols (desc, entry);
-      entry->strings = (char *) alloca (entry->strs_size);
+      entry->strings = (char *) malloc (entry->strs_size);
       read_entry_strings (desc, entry);
       enter_file_symbols (entry);
-      entry->strings = 0;
+      free (entry->strings);
+      entry->strings = NULL;
     }
 
@@ -2533 +2529 @@
 {
   read_entry_symbols (desc, subentry);
-  subentry->strings = (char *) alloca (subentry->strs_size);
+  subentry->strings = (char *) malloc (subentry->strs_size);
   read_entry_strings (desc, subentry);
 
@@ -2550 +2546 @@
         entry->subfiles = subentry;
       *prev_addr = subentry;
-      subentry->strings = 0; /* Since space will dissapear on return */
-    }
+    }
+  free (subentry->strings);
+  subentry->strings = NULL;
 }
 
@@ -3062 +3059 @@
     *end = entry->symbols + entry->syms_size / sizeof (struct nlist);
 
-  entry->strings = (char *) alloca (entry->strs_size);
+  entry->strings = (char *) malloc (entry->strs_size);
   read_entry_strings (file_open (entry), entry);
 
@@ -3080 +3077 @@
                ((symbol *)p->n_un.n_name)->name, p->n_value);
 
-  entry->strings = 0;           /* All done with them.  */
+  free (entry->strings);
+  entry->strings = NULL;                /* All done with them.  */
 }
 
@@ -3451 +3449 @@
   int number_of_syms = entry->syms_size / sizeof (struct nlist);
   unsigned char *nlist_bitvector
-    = (unsigned char *) alloca ((number_of_syms >> 3) + 1);
+    = (unsigned char *) malloc ((number_of_syms >> 3) + 1);
   struct line_debug_entry *text_scan, *data_scan;
   int i;
@@ -3465 +3463 @@
       int desc;
 
-      entry->strings = (char *) alloca (entry->strs_size);
+      entry->strings = (char *) malloc (entry->strs_size);
       desc = file_open (entry);
       read_entry_strings (desc, entry);
@@ -3585 +3583 @@
   free (text_scan);
   free (data_scan);
-  entry->strings = 0;           /* Since it will dissapear anyway.  */
+  free (entry->strings);
+  entry->strings = NULL;
+  free (nlist_bitvector);
 }
 
@@ -4186 +4186 @@
   /* Allocate space for the file's text section */
 
-  bytes = (char *) alloca (entry->text_size);
+  bytes = (char *) malloc (entry->text_size);
 
   /* Deal with relocation information however is appropriate */
@@ -4218 +4218 @@
 
   mywrite (bytes, 1, entry->text_size, outdesc);
+
+  free (bytes);
 }
 
@@ -4314 +4316 @@
   desc = file_open (entry);
 
-  bytes = (char *) alloca (entry->data_size);
+  bytes = (char *) malloc (entry->data_size);
 
   if (entry->datarel) reloc = entry->datarel;
@@ -4339 +4341 @@
   mywrite (bytes, 1, entry->data_size, outdesc);
   padfile ((SECTION_ALIGN - entry->data_size) & SECTION_ALIGN_MASK, outdesc);
+
+  free (bytes);
 }
 
@@ -4823 +4827 @@
      extra struct for each indirect symbol to hold the extra reference
      following. */
-  struct nlist *buf = (struct nlist *) alloca ((defined_global_sym_count
+  struct nlist *buf = (struct nlist *) malloc ((defined_global_sym_count
                                 + undefined_global_sym_count
                                 + global_indirect_count)
@@ -4850 +4854 @@
      extra space for the references following indirect outputs. */
 
-  strtab_vector = (char **) alloca ((num_hash_tab_syms
+  strtab_vector = (char **) malloc ((num_hash_tab_syms
                                      + global_indirect_count) * sizeof (char *));
-  strtab_lens = (int *) alloca ((num_hash_tab_syms
+  strtab_lens = (int *) malloc ((num_hash_tab_syms
                                  + global_indirect_count) * sizeof (int));
   strtab_index = 0;
@@ -4964 +4968 @@
 
   write_string_table ();
+  free (strtab_vector);
+  strtab_vector = NULL;
+  free (strtab_lens);
+  strtab_lens = NULL;
+  free (buf);
 }
 
@@ -4984 +4993 @@
      It has one extra slot for the local symbol we generate here.  */
   struct nlist *buf
-    = (struct nlist *) alloca (entry->syms_size + sizeof (struct nlist));
+    = (struct nlist *) malloc (entry->syms_size + sizeof (struct nlist));
   register struct nlist *bufp = buf;
 
@@ -4993 +5002 @@
      The elements are filled in by `assign_string_table_index'.  */
 
-  strtab_vector = (char **) alloca (max_syms * sizeof (char *));
-  strtab_lens = (int *) alloca (max_syms * sizeof (int));
+  strtab_vector = (char **) malloc (max_syms * sizeof (char *));
+  strtab_lens = (int *) malloc (max_syms * sizeof (int));
   strtab_index = 0;
 
@@ -5033 +5042 @@
   /* Read the file's string table.  */
 
-  entry->strings = (char *) alloca (entry->strs_size);
+  entry->strings = (char *) malloc (entry->strs_size);
   read_entry_strings (file_open (entry), entry);
 
@@ -5086 +5095 @@
 
   write_string_table ();
-  entry->strings = 0;           /* Since it will dissapear anyway.  */
+  free (entry->strings);
+  entry->strings = NULL;
+  free (strtab_vector);
+  strtab_vector = NULL;
+  free (strtab_lens);
+  strtab_lens = NULL;
+  free (buf);
 }