#include "cil-coff.h"
#include "rawbuffer.h"
#include "mono-endian.h"
-#include "private.h"
#include "tabledefs.h"
#include "tokentype.h"
#include "metadata-internals.h"
#include <mono/io-layer/io-layer.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#define INVALID_ADDRESS 0xffffffff
writable = sect->st_flags & SECT_FLAGS_MEM_WRITE;
- if (!image->f) {
- if (sect->st_raw_data_ptr + sect->st_raw_data_size > image->raw_data_len)
- return FALSE;
- /* FIXME: we ignore the writable flag since we don't patch the binary */
- iinfo->cli_sections [section] = image->raw_data + sect->st_raw_data_ptr;
- return TRUE;
- }
- iinfo->cli_sections [section] = mono_raw_buffer_load (
- fileno (image->f), writable,
- sect->st_raw_data_ptr, sect->st_raw_data_size);
-
- if (iinfo->cli_sections [section] == NULL)
+ if (sect->st_raw_data_ptr + sect->st_raw_data_size > image->raw_data_len)
return FALSE;
-
+ /* FIXME: we ignore the writable flag since we don't patch the binary */
+ iinfo->cli_sections [section] = image->raw_data + sect->st_raw_data_ptr;
return TRUE;
}
for (i = 0; i < top; i++){
MonoSectionTable *t = &iinfo->cli_section_tables [i];
- if (!image->f) {
- if (offset + sizeof (MonoSectionTable) > image->raw_data_len)
- return FALSE;
- memcpy (t, image->raw_data + offset, sizeof (MonoSectionTable));
- offset += sizeof (MonoSectionTable);
- } else {
- if (fread (t, sizeof (MonoSectionTable), 1, image->f) != 1)
- return FALSE;
- }
+ if (offset + sizeof (MonoSectionTable) > image->raw_data_len)
+ return FALSE;
+ memcpy (t, image->raw_data + offset, sizeof (MonoSectionTable));
+ offset += sizeof (MonoSectionTable);
#if G_BYTE_ORDER != G_LITTLE_ENDIAN
t->st_virtual_size = GUINT32_FROM_LE (t->st_virtual_size);
load_cli_header (MonoImage *image, MonoCLIImageInfo *iinfo)
{
guint32 offset;
- int n;
offset = mono_cli_rva_image_map (iinfo, iinfo->cli_header.datadir.pe_cli_header.rva);
if (offset == INVALID_ADDRESS)
return FALSE;
- if (!image->f) {
- if (offset + sizeof (MonoCLIHeader) > image->raw_data_len)
- return FALSE;
- memcpy (&iinfo->cli_cli_header, image->raw_data + offset, sizeof (MonoCLIHeader));
- } else {
- if (fseek (image->f, offset, SEEK_SET) != 0)
- return FALSE;
-
- if ((n = fread (&iinfo->cli_cli_header, sizeof (MonoCLIHeader), 1, image->f)) != 1)
- return FALSE;
- }
+ if (offset + sizeof (MonoCLIHeader) > image->raw_data_len)
+ return FALSE;
+ memcpy (&iinfo->cli_cli_header, image->raw_data + offset, sizeof (MonoCLIHeader));
#if G_BYTE_ORDER != G_LITTLE_ENDIAN
#define SWAP32(x) (x) = GUINT32_FROM_LE ((x))
size = iinfo->cli_cli_header.ch_metadata.size;
- if (!image->f) {
- if (offset + size > image->raw_data_len)
- return FALSE;
- image->raw_metadata = image->raw_data + offset;
- } else {
- image->raw_metadata = mono_raw_buffer_load (fileno (image->f), FALSE, offset, size);
- if (image->raw_metadata == NULL)
- return FALSE;
- }
+ if (offset + size > image->raw_data_len)
+ return FALSE;
+ image->raw_metadata = image->raw_data + offset;
ptr = image->raw_metadata;
void
mono_image_init (MonoImage *image)
{
+ image->mempool = mono_mempool_new ();
image->method_cache = g_hash_table_new (NULL, NULL);
image->class_cache = g_hash_table_new (NULL, NULL);
image->field_cache = g_hash_table_new (NULL, NULL);
MonoCLIImageInfo *iinfo;
MonoDotNetHeader *header;
MonoMSDOSHeader msdos;
- int n;
guint32 offset = 0;
mono_image_init (image);
if (status)
*status = MONO_IMAGE_IMAGE_INVALID;
- if (!image->f) {
- if (offset + sizeof (msdos) > image->raw_data_len)
- goto invalid_image;
- memcpy (&msdos, image->raw_data + offset, sizeof (msdos));
- } else {
- if (fread (&msdos, sizeof (msdos), 1, image->f) != 1)
- goto invalid_image;
- }
+ if (offset + sizeof (msdos) > image->raw_data_len)
+ goto invalid_image;
+ memcpy (&msdos, image->raw_data + offset, sizeof (msdos));
if (!(msdos.msdos_sig [0] == 'M' && msdos.msdos_sig [1] == 'Z'))
goto invalid_image;
msdos.pe_offset = GUINT32_FROM_LE (msdos.pe_offset);
- if (msdos.pe_offset != sizeof (msdos)) {
- if (image->f)
- fseek (image->f, msdos.pe_offset, SEEK_SET);
- }
offset = msdos.pe_offset;
- if (!image->f) {
- if (offset + sizeof (MonoDotNetHeader) > image->raw_data_len)
- goto invalid_image;
- memcpy (header, image->raw_data + offset, sizeof (MonoDotNetHeader));
- offset += sizeof (MonoDotNetHeader);
- } else {
- if ((n = fread (header, sizeof (MonoDotNetHeader), 1, image->f)) != 1)
- goto invalid_image;
- }
+ if (offset + sizeof (MonoDotNetHeader) > image->raw_data_len)
+ goto invalid_image;
+ memcpy (header, image->raw_data + offset, sizeof (MonoDotNetHeader));
+ offset += sizeof (MonoDotNetHeader);
#if G_BYTE_ORDER != G_LITTLE_ENDIAN
#define SWAP32(x) (x) = GUINT32_FROM_LE ((x))
MonoCLIImageInfo *iinfo;
MonoImage *image;
FILE *filed;
+ struct stat stat_buf;
if ((filed = fopen (fname, "rb")) == NULL){
if (status)
return NULL;
}
+ if (fstat (fileno (filed), &stat_buf)) {
+ fclose (filed);
+ if (status)
+ *status = MONO_IMAGE_ERROR_ERRNO;
+ return NULL;
+ }
image = g_new0 (MonoImage, 1);
image->ref_count = 1;
- image->f = filed;
+ image->file_descr = filed;
+ image->raw_data_len = stat_buf.st_size;
+ image->raw_data = mono_raw_buffer_load (fileno (filed), FALSE, 0, stat_buf.st_size);
iinfo = g_new0 (MonoCLIImageInfo, 1);
image->image_info = iinfo;
image->name = canonicalize_path (fname);
return res;
}
+static MonoImage *
+register_image (MonoImage *image)
+{
+ MonoImage *image2;
+
+ EnterCriticalSection (&images_mutex);
+ image2 = g_hash_table_lookup (loaded_images_hash, image->name);
+
+ if (image2) {
+ /* Somebody else beat us to it */
+ mono_image_addref (image2);
+ LeaveCriticalSection (&images_mutex);
+ mono_image_close (image);
+ return image2;
+ }
+ g_hash_table_insert (loaded_images_hash, image->name, image);
+ if (image->assembly_name && (g_hash_table_lookup (loaded_images_hash, image->assembly_name) == NULL))
+ g_hash_table_insert (loaded_images_hash, (char *) image->assembly_name, image);
+ g_hash_table_insert (loaded_images_guid_hash, image->guid, image);
+ LeaveCriticalSection (&images_mutex);
+
+ return image;
+}
+
MonoImage *
mono_image_open_from_data (char *data, guint32 data_len, gboolean need_copy, MonoImageOpenStatus *status)
{
iinfo = g_new0 (MonoCLIImageInfo, 1);
image->image_info = iinfo;
- return do_mono_image_load (image, status, TRUE);
+ image = do_mono_image_load (image, status, TRUE);
+ if (image == NULL)
+ return NULL;
+
+ return register_image (image);
}
/**
MonoImage *
mono_image_open (const char *fname, MonoImageOpenStatus *status)
{
- MonoImage *image, *image2;
+ MonoImage *image;
char *absfname;
g_return_val_if_fail (fname != NULL, NULL);
g_free (absfname);
if (image){
- image->ref_count++;
+ mono_image_addref (image);
LeaveCriticalSection (&images_mutex);
return image;
}
if (image == NULL)
return NULL;
- EnterCriticalSection (&images_mutex);
- image2 = g_hash_table_lookup (loaded_images_hash, image->name);
-
- if (image2) {
- /* Somebody else beat us to it */
- image2->ref_count ++;
- LeaveCriticalSection (&images_mutex);
- mono_image_close (image);
- return image2;
- }
- g_hash_table_insert (loaded_images_hash, image->name, image);
- if (image->assembly_name && (g_hash_table_lookup (loaded_images_hash, image->assembly_name) == NULL))
- g_hash_table_insert (loaded_images_hash, (char *) image->assembly_name, image);
- g_hash_table_insert (loaded_images_guid_hash, image->guid, image);
- LeaveCriticalSection (&images_mutex);
-
- return image;
+ return register_image (image);
}
/**
mono_image_close (MonoImage *image)
{
MonoImage *image2;
+ int i;
g_return_if_fail (image != NULL);
EnterCriticalSection (&images_mutex);
- /*g_print ("destroy image %p (dynamic: %d) refcount: %d\n", image, image->dynamic, image->ref_count);*/
+ /*g_print ("destroy image '%s' %p (dynamic: %d) refcount: %d\n", image->name, image, image->dynamic, image->ref_count);*/
g_assert (image->ref_count > 0);
if (--image->ref_count) {
LeaveCriticalSection (&images_mutex);
g_hash_table_remove (loaded_images_hash, (char *) image->assembly_name);
LeaveCriticalSection (&images_mutex);
- if (image->f)
- fclose (image->f);
+ if (image->file_descr) {
+ fclose (image->file_descr);
+ image->file_descr = NULL;
+ if (image->raw_data != NULL)
+ mono_raw_buffer_free (image->raw_data);
+ }
+
if (image->raw_data_allocated) {
/* image->raw_metadata and cli_sections might lie inside image->raw_data */
MonoCLIImageInfo *ii = image->image_info;
- int i;
if ((image->raw_metadata > image->raw_data) &&
(image->raw_metadata <= (image->raw_data + image->raw_data_len)))
g_hash_table_foreach (image->helper_signatures, free_mr_signatures, NULL);
g_hash_table_destroy (image->helper_signatures);
- if (image->raw_metadata != NULL)
- mono_raw_buffer_free (image->raw_metadata);
-
if (image->image_info){
MonoCLIImageInfo *ii = image->image_info;
- int i;
- for (i = 0; i < ii->cli_section_count; i++){
- if (!ii->cli_sections [i])
- continue;
- mono_raw_buffer_free (ii->cli_sections [i]);
- }
if (ii->cli_section_tables)
g_free (ii->cli_section_tables);
if (ii->cli_sections)
g_free (image->image_info);
}
+ for (i = 0; i < image->module_count; ++i) {
+ if (image->modules [i])
+ mono_image_close (image->modules [i]);
+ }
/*g_print ("destroy image %p (dynamic: %d)\n", image, image->dynamic);*/
if (!image->dynamic) {
+ mono_mempool_destroy (image->mempool);
g_free (image);
} else {
/* Dynamic images are GC_MALLOCed */
struct _MonoDynamicImage *di = (struct _MonoDynamicImage*)image;
int i;
+ g_free ((char*)image->module_name);
if (di->typespec)
g_hash_table_destroy (di->typespec);
if (di->typeref)
g_hash_table_destroy (di->method_aux_hash);
g_free (di->strong_name);
g_free (di->win32_res);
+ /*g_print ("string heap destroy for image %p\n", di);*/
mono_dynamic_stream_reset (&di->sheap);
mono_dynamic_stream_reset (&di->code);
mono_dynamic_stream_reset (&di->resources);
for (i = 0; i < MONO_TABLE_NUM; ++i) {
g_free (di->tables [i].values);
}
+ mono_mempool_destroy (image->mempool);
}
}
projects / mono.git / blobdiff