Resolves: #i124661# secure possible out of bound access to vector

(cherry picked from commit c9cdd9751d45b5b8b0288e9dc477e6d272ba0a0d)

Change-Id: I1c0637029fd7b4ab493956538c6e9fdf33307cbe