#define SIZEOF_ILF_SECTIONS (NUM_ILF_SECTIONS * sizeof (struct coff_section_tdata))
#define ILF_DATA_SIZE \
- sizeof (* vars.bim) \
+ SIZEOF_ILF_SYMS \
+ SIZEOF_ILF_SYM_TABLE \
+ SIZEOF_ILF_NATIVE_SYMS \
We are going to construct the contents of the BFD in memory,
so allocate all the space that we will need right now. */
- ptr = bfd_zalloc (abfd, (bfd_size_type) ILF_DATA_SIZE);
- if (ptr == NULL)
+ vars.bim
+ = (struct bfd_in_memory *) bfd_malloc ((bfd_size_type) sizeof (*vars.bim));
+ if (vars.bim == NULL)
return FALSE;
- /* Create a bfd_in_memory structure. */
- vars.bim = (struct bfd_in_memory *) ptr;
+ ptr = (bfd_byte *) bfd_zmalloc ((bfd_size_type) ILF_DATA_SIZE);
vars.bim->buffer = ptr;
vars.bim->size = ILF_DATA_SIZE;
- ptr += sizeof (* vars.bim);
+ if (ptr == NULL)
+ goto error_return;
/* Initialise the pointers to regions of the memory and the
other contents of the pe_ILF_vars structure as well. */
id4 = pe_ILF_make_a_section (& vars, ".idata$4", SIZEOF_IDATA4, 0);
id5 = pe_ILF_make_a_section (& vars, ".idata$5", SIZEOF_IDATA5, 0);
if (id4 == NULL || id5 == NULL)
- return FALSE;
+ goto error_return;
/* Fill in the contents of these sections. */
if (import_name_type == IMPORT_ORDINAL)
/* Create .idata$6 - the Hint Name Table. */
id6 = pe_ILF_make_a_section (& vars, ".idata$6", SIZEOF_IDATA6, 0);
if (id6 == NULL)
- return FALSE;
+ goto error_return;
/* If necessary, trim the import symbol name. */
symbol = symbol_name;
/* Create the .text section. */
text = pe_ILF_make_a_section (& vars, ".text", jtab[i].size, SEC_CODE);
if (text == NULL)
- return FALSE;
+ goto error_return;
/* Copy in the jump code. */
memcpy (text->contents, jtab[i].data, jtab[i].size);
if ( ! bfd_set_start_address (abfd, (bfd_vma) 0)
|| ! bfd_coff_set_arch_mach_hook (abfd, & internal_f))
- return FALSE;
+ goto error_return;
if (bfd_coff_mkobject_hook (abfd, (void *) & internal_f, NULL) == NULL)
- return FALSE;
+ goto error_return;
coff_data (abfd)->pe = 1;
#ifdef THUMBPEMAGIC
abfd->iostream = (void *) vars.bim;
abfd->flags |= BFD_IN_MEMORY /* | HAS_LOCALS */;
+ abfd->iovec = &_bfd_memory_iovec;
abfd->where = 0;
+ abfd->origin = 0;
obj_sym_filepos (abfd) = 0;
/* Now create a symbol describing the imported value. */
abfd->flags |= HAS_SYMS;
return TRUE;
+
+ error_return:
+ if (vars.bim->buffer != NULL)
+ free (vars.bim->buffer);
+ free (vars.bim);
+ return FALSE;
}
/* We have detected a Image Library Format archive element.
/* ptr += 2; */
/* Now read in the two strings that follow. */
- ptr = bfd_alloc (abfd, size);
+ ptr = (bfd_byte *) bfd_alloc (abfd, size);
if (ptr == NULL)
return NULL;