ilmControl: fix NULL deref in getPropertiesOfScreen

Signed-off-by: Marcus Fritzsch <marcus.fritzsch@xse.de>

1 files changed, 13 insertions, 16 deletions

diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
index 796878c..2709c6f 100644
--- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
+++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c
@@ -1513,24 +1513,21 @@ wayland_getPropertiesOfScreen(t_ilm_display screenID,
                               struct ilmScreenProperties* pScreenProperties)
 {
     ilmErrorTypes returnValue = ILM_FAILED;
-    struct ilm_control_context *ctx = sync_and_acquire_instance();
 
-    if (pScreenProperties != NULL) {
-        struct screen_context *ctx_screen = NULL;
-        ctx_screen = get_screen_context_by_id(&ctx->wl, (uint32_t)screenID);
-        if (ctx_screen != NULL) {
-            *pScreenProperties = ctx_screen->prop;
-            create_layerids(ctx_screen, &pScreenProperties->layerIds,
-                                        &pScreenProperties->layerCount);
-            returnValue = ILM_SUCCESS;
-        }
+    if (! pScreenProperties)
+    {
+        return ILM_ERROR_INVALID_ARGUMENTS;
     }
-    else {
-        pScreenProperties->layerCount = 0;
-        pScreenProperties->harwareLayerCount = 0;
-        pScreenProperties->layerIds = NULL;
-        pScreenProperties->screenWidth = 0;
-        pScreenProperties->screenHeight = 0;
+
+    struct ilm_control_context *ctx = sync_and_acquire_instance();
+
+    struct screen_context *ctx_screen = NULL;
+    ctx_screen = get_screen_context_by_id(&ctx->wl, (uint32_t)screenID);
+    if (ctx_screen != NULL) {
+        *pScreenProperties = ctx_screen->prop;
+        create_layerids(ctx_screen, &pScreenProperties->layerIds,
+                                    &pScreenProperties->layerCount);
+        returnValue = ILM_SUCCESS;
     }
 
     release_instance();