From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Glass <sjg@chromium.org>
Date: Sun, 7 Jun 2020 07:45:53 -0600
Subject: [PATCH 1/1] sandbox: handling out of memory
In-Reply-To: <20200604172822.13112-1-xypron.glpk@gmx.de>
References: <20200604172822.13112-1-xypron.glpk@gmx.de>
Message-ID: <CAPnjgZ17WV_x+HPGAURwxHy5HkTbLovYC--rGc_Oq2miGUWV5A@mail.gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Heinrich,

On Thu, 4 Jun 2020 at 11:28, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
>
> assert() only works in debug mode. So checking a successful memory
> allocation should not use assert().
>

Reviewed-by: Simon Glass <sjg@chromium.org>

What sort of environment are you using that returns NULL in this case?

Regards,
Simon


> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>  arch/sandbox/cpu/state.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
> index 1f794123b3..34b6fff7e7 100644
> --- a/arch/sandbox/cpu/state.c
> +++ b/arch/sandbox/cpu/state.c
> @@ -378,7 +378,10 @@ int state_init(void)
>
>         state->ram_size = CONFIG_SYS_SDRAM_SIZE;
>         state->ram_buf = os_malloc(state->ram_size);
> -       assert(state->ram_buf);
> +       if (!state->ram_buf) {
> +               printf("Out of memory\n");
> +               os_exit(1);
> +       }
>
>         state_reset_for_test(state);
>         /*
> --
> 2.26.2
>