2015-06-23 12:04:18

by Anupam Roy

Subject: [PATCH] android/client/if-hl.c:Handle failure from malloc() request

In case malloc() request fails, just print error message
and return. Dereferencing reg.mdep_cfg in case of failure
can lead to crash.
---
android/client/if-hl.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/android/client/if-hl.c b/android/client/if-hl.c
index e0818ba..bd05671 100644
--- a/android/client/if-hl.c
+++ b/android/client/if-hl.c
@@ -201,6 +201,10 @@ static void register_application_p(int argc, const char **argv)
reg.number_of_mdeps = atoi(argv[6]);

reg.mdep_cfg = malloc(reg.number_of_mdeps * sizeof(bthl_mdep_cfg_t));
+ if (!reg.mdep_cfg) {
+ haltest_error("malloc failed\n");
+ return;
+ }
mdep_argc_init = 7;

for (i = 0; i < reg.number_of_mdeps; i++) {
--
1.9.1

2015-07-27 19:22:51

by Szymon Janc

Subject: Re: [PATCH] android/client/if-hl.c:Handle failure from malloc() request

Hi Anupam,

On Tuesday 21 of July 2015 09:38:01 Anupam Roy wrote:
> In case malloc() request fails, just print error message
> and return. Dereferencing reg.mdep_cfg in case of failure
> can lead to crash.
> ---
> android/client/if-hl.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/android/client/if-hl.c b/android/client/if-hl.c
> index e0818ba..bd05671 100644
> --- a/android/client/if-hl.c
> +++ b/android/client/if-hl.c
> @@ -201,6 +201,10 @@ static void register_application_p(int argc, const char
> **argv) reg.number_of_mdeps = atoi(argv[6]);
>
> reg.mdep_cfg = malloc(reg.number_of_mdeps * sizeof(bthl_mdep_cfg_t));
> + if (!reg.mdep_cfg) {
> + haltest_error("malloc failed\n");
> + return;
> + }
> mdep_argc_init = 7;
>
> for (i = 0; i < reg.number_of_mdeps; i++) {

Patch applied, thanks.

--
BR
Szymon Janc