Fixes out of array accesses
Fixes Ticket3190
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0cc5011f)