summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2015-10-20 11:56:55 +0200
committerLukasz Stanislawski <l.stanislaws@samsung.com>2015-10-20 12:00:08 +0200
commitec69c39e6965c7d0a9fa2f4d09f87af2ad0f8822 (patch)
tree61e48fb8a0b092233f581ba208d5c3b6ac007f8a
parent04c553525086fd212c8a27e38c135a27cba42ba0 (diff)
atspi: fix invalid shift operation.
Add additional check in case when Elm_Atspi_Role_Type enum will enlarge. CID: 1325724
-rw-r--r--src/lib/elm_atspi_bridge.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/elm_atspi_bridge.c b/src/lib/elm_atspi_bridge.c
index c75560103..6019cca77 100644
--- a/src/lib/elm_atspi_bridge.c
+++ b/src/lib/elm_atspi_bridge.c
@@ -2589,7 +2589,7 @@ _collection_match_roles_lookup(Eo *obj, struct collection_match_rule *rule)
2589 2589
2590 eo_do(obj, role = elm_interface_atspi_accessible_role_get()); 2590 eo_do(obj, role = elm_interface_atspi_accessible_role_get());
2591 2591
2592 if (role > 64) 2592 if (role >= 64)
2593 { 2593 {
2594 role -= 64; 2594 role -= 64;
2595 role_set = rule->roles[1]; 2595 role_set = rule->roles[1];
@@ -2597,6 +2597,12 @@ _collection_match_roles_lookup(Eo *obj, struct collection_match_rule *rule)
2597 else 2597 else
2598 role_set = rule->roles[0]; 2598 role_set = rule->roles[0];
2599 2599
2600 if (role >= 64)
2601 {
2602 ERR("Elm_Atspi_Role enum value exceeds 127. Unable to compare with roles bit field.");
2603 return EINA_FALSE;
2604 }
2605
2600 switch (rule->rolematchtype) 2606 switch (rule->rolematchtype)
2601 { 2607 {
2602 case ATSPI_Collection_MATCH_INVALID: 2608 case ATSPI_Collection_MATCH_INVALID: