Merge "lshal: fix potential out-of-range error."