Fix security vulnerability: Effect command might allow negative indexes am:...

Fix security vulnerability: Effect command might allow negative indexes am: 01183402 am: 94e3424b am: 9bf3487e am: d4881f84 am: f31abe2c am: 0905c40e am: 7b4d7904 am: a6323b04 am: d8383694 am: e92a0c60 am: 3712921a am: df9b8955 am: 3939df61
am: af55335d

Change-Id: I5195555a02017f10c0b01882fbe4385f3d5d73fe