From cfa0b74d5a7782531f73112824c13a90c24e3459 Mon Sep 17 00:00:00 2001 From: Nobuhiko Tanibata Date: Fri, 8 Aug 2014 09:47:57 +0900 Subject: ivi-controller: Fix NULL deref in controller_screen_set_render_order and invalid cast of pointer. Signed-off-by: Nobuhiko Tanibata --- weston-ivi-shell/src/ivi-controller.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c index 3a66d37..8387575 100755 --- a/weston-ivi-shell/src/ivi-controller.c +++ b/weston-ivi-shell/src/ivi-controller.c @@ -1077,8 +1077,8 @@ controller_screen_set_render_order(struct wl_client *client, int i = 0; (void)client; - *layoutlayer_array = (struct ivi_layout_layer*)calloc( - id_layers->size, sizeof(void*)); + layoutlayer_array = (struct ivi_layout_layer**)calloc( + id_layers->size, sizeof(void*)); wl_array_for_each(id_layer, id_layers) { wl_list_for_each(ivilayer, &iviscrn->shell->list_layer, link) { -- cgit v1.2.1