* Orit Wasserman (owass...@redhat.com) wrote:
> Signed-off-by: Orit Wasserman <owass...@redhat.com>
> ---
> arch_init.c | 16 ++++++++++++++--
> page_cache.c | 18 ++++++++++++++----
> 2 files changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/arch_init.c b/arch_init.c
> index 5eff80b..806d096 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -664,8 +664,20 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
> DPRINTF("Error creating cache\n");
> return -1;
> }
> - XBZRLE.encoded_buf = g_malloc0(TARGET_PAGE_SIZE);
> - XBZRLE.current_buf = g_malloc(TARGET_PAGE_SIZE);
> +
> + /* We prefer not to abort if there is no memory */
> + XBZRLE.encoded_buf = g_try_malloc0(TARGET_PAGE_SIZE);
> + if (!XBZRLE.encoded_buf) {
> + DPRINTF("Error allocating encoded_buf\n");
> + return -1;
> + }
> +
> + XBZRLE.current_buf = g_try_malloc(TARGET_PAGE_SIZE);
> + if (!XBZRLE.current_buf) {
> + DPRINTF("Error allocating current_buf\n");
> + return -1;
> + }
Would it be best to free encoded_buf in this second exit case?
Dave
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
