Paolo Bonzini <[email protected]> writes:
> Replace malloc/free with g_malloc/g_free to get a program exit on
> out of memory.
>
> Replace g_malloc with g_new when allocating the MemoryRegion to
> get more type safety.
>
> Reported by Coverity.
>
> Cc: Max Filippov <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paolo Bonzini <[email protected]>
> ---
> hw/xtensa/sim.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
> index d2d1d3a6fd..97307728f7 100644
> --- a/hw/xtensa/sim.c
> +++ b/hw/xtensa/sim.c
> @@ -41,13 +41,13 @@ static void xtensa_create_memory_regions(const
> XtensaMemory *memory,
> const char *name)
> {
> unsigned i;
> - char *num_name = malloc(strlen(name) + sizeof(i) * 3 + 1);
> + char *num_name = g_malloc(strlen(name) + sizeof(i) * 3 + 1);
It seems a little sketchy using the size of the storage type as a proxy
for the number of bytes used by the format specifier in a format string.
In this sort of situation I'd just use Glib and stop worrying about it:
GString num_name = g_string_new(NULL);
...
g_string_printf(num_name, "%s%u", name, i);
m = g_new(MemoryRegion, 1);
memory_region_init_ram(m, NULL, num_name->str,
memory->location[i].size,
&error_fatal);
...
g_string_free(name, TRUE);
>
> for (i = 0; i < memory->num; ++i) {
> MemoryRegion *m;
>
> sprintf(num_name, "%s%u", name, i);
> - m = g_malloc(sizeof(*m));
> + m = g_new(MemoryRegion, 1);
> memory_region_init_ram(m, NULL, num_name,
> memory->location[i].size,
> &error_fatal);
> @@ -55,7 +55,7 @@ static void xtensa_create_memory_regions(const XtensaMemory
> *memory,
> memory_region_add_subregion(get_system_memory(),
> memory->location[i].addr, m);
> }
> - free(num_name);
> + g_free(num_name);
> }
>
> static uint64_t translate_phys_addr(void *opaque, uint64_t addr)
--
Alex Bennée
