Merge change 25839 into eclair

* changes:
  Fix potential ArrayIndexOutOfBoundsException.