e_comp_canvas: changed default value to E_LAYER_COUNT-1 in e_comp_canvas_layer_map.

This change prevents to access the e_comp->layers list out of bounds.

Change-Id: I7e7ca5938ea23cd8b515f0ccf113052cb8a0bd00

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 756f3cc3202e556522e8c1fa287cda3ff1c97b80..e9adf3c4e41fa4533a7b1eb64f4bf1e5b9b20e1e 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4369,8 +4369,10 @@ e_client_below_get(const E_Client *ec)
           }
      }
 
+   if (ec->layer == E_LAYER_CLIENT_DESKTOP) return NULL;
+   if (e_comp_canvas_client_layer_map(ec->layer) == 9999) return NULL;
+
    /* go down the layers until we find one */
-   if (e_comp_canvas_layer_map(ec->layer) > e_comp_canvas_layer_map(E_LAYER_MAX)) return NULL;
    x = e_comp_canvas_layer_map(ec->layer);
    if (x > 0) x--;
 

diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 01249aafd509d16ccc46c90a0097e3be0fe2766d..4068fa99b6308113f65d27337098f4cb3db30567 100644 (file)
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -604,7 +604,7 @@ e_comp_canvas_layer_map(E_Layer layer)
 
    /* prevents to access the e_comp->layers list out of bounds. */
    ELOGF("WARNING", "Used not defined layer:%d", NULL, NULL, layer);
-   return E_LAYER_MAX;
+   return E_LAYER_COUNT - 1;
 }
 
 E_API unsigned int