Re: [Qemu-devel] [PATCH 6/6] softmmu-semi: fix lock_user* functions not to deref NULL upon OOM

[Matthew Fernandez]

On 16 May 2012 23:08, Jim Meyering <address@hidden> wrote:
> From: Jim Meyering <address@hidden>
>
> Use g_malloc/g_free in place of malloc/free.
>
> Signed-off-by: Jim Meyering <address@hidden>

Acked-by: Matthew Fernandez <address@hidden>

> ---
>  softmmu-semi.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/softmmu-semi.h b/softmmu-semi.h
> index 648cb95..996e0f7 100644
> --- a/softmmu-semi.h
> +++ b/softmmu-semi.h
> @@ -39,7 +39,7 @@ static void *softmmu_lock_user(CPUArchState *env, uint32_t 
> addr, uint32_t len,
>  {
>     uint8_t *p;
>     /* TODO: Make this something that isn't fixed size.  */
> -    p = malloc(len);
> +    p = g_malloc(len);
>     if (copy)
>         cpu_memory_rw_debug(env, addr, p, len, 0);
>     return p;
> @@ -51,7 +51,7 @@ static char *softmmu_lock_user_string(CPUArchState *env, 
> uint32_t addr)
>     char *s;
>     uint8_t c;
>     /* TODO: Make this something that isn't fixed size.  */
> -    s = p = malloc(1024);
> +    s = p = g_malloc(1024);
>     do {
>         cpu_memory_rw_debug(env, addr, &c, 1, 0);
>         addr++;
> @@ -65,6 +65,6 @@ static void softmmu_unlock_user(CPUArchState *env, void *p, 
> target_ulong addr,
>  {
>     if (len)
>         cpu_memory_rw_debug(env, addr, p, len, 1);
> -    free(p);
> +    g_free(p);
>  }
>  #define unlock_user(s, args, len) softmmu_unlock_user(env, s, args, len)
> --
> 1.7.10.2.520.g6a4a482
>