Re: [Xen-devel] [PATCH 27/28] mini-os: fix various memory leaks in various locations

[Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>]

Matthew Daley, le Wed 18 Sep 2013 15:38:03 +1200, a écrit :
> Coverity-ID: 1055827
> Coverity-ID: 1055828
> Coverity-ID: 1055829
> Coverity-ID: 1055830
> Coverity-ID: 1055831
> Signed-off-by: Matthew Daley <mattjd@xxxxxxxxx>

Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>

> ---
>  extras/mini-os/kernel.c |    7 +++++--
>  extras/mini-os/lib/xs.c |    2 ++
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c
> index e9402b9..24fa25c 100644
> --- a/extras/mini-os/kernel.c
> +++ b/extras/mini-os/kernel.c
> @@ -84,8 +84,10 @@ static void shutdown_thread(void *p)
>          free(err);
>          xenbus_wait_for_watch(&events);
>      }
> -    xenbus_unwatch_path_token(XBT_NIL, path, token);
> -    xenbus_write(XBT_NIL, path, "");
> +    err = xenbus_unwatch_path_token(XBT_NIL, path, token);
> +    if (err) free(err);
> +    err = xenbus_write(XBT_NIL, path, "");
> +    if (err) free(err);
>      printk("Shutting down (%s)\n", shutdown);
>  
>      if (!strcmp(shutdown, "poweroff"))
> @@ -96,6 +98,7 @@ static void shutdown_thread(void *p)
>          /* Unknown */
>          shutdown_reason = SHUTDOWN_crash;
>      app_shutdown(shutdown_reason);
> +    free(shutdown);
>  }
>  #endif
>  
> diff --git a/extras/mini-os/lib/xs.c b/extras/mini-os/lib/xs.c
> index c603d17..324bd05 100644
> --- a/extras/mini-os/lib/xs.c
> +++ b/extras/mini-os/lib/xs.c
> @@ -144,6 +144,7 @@ char **xs_directory(struct xs_handle *h, xs_transaction_t 
> t,
>      msg = xenbus_ls(t, path, &res);
>      if (msg) {
>       printk("xs_directory(%s): %s\n", path, msg);
> +     free(msg);
>       return NULL;
>      }
>  
> @@ -163,6 +164,7 @@ char **xs_directory(struct xs_handle *h, xs_transaction_t 
> t,
>      }
>  
>      *num = n;
> +    free(res);
>      return entries;
>  }
>  
> -- 
> 1.7.10.4
> 

-- 
Samuel
***e trouve un .xls
***e passe un moment à se demander quelle version de xml c'est ça, le .xls
e: donc j'ai fait un file....
 -+- #sos - on n'a pas forcément les mêmes références que tout le monde -+-

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel