Fix potential buffer overrun. am: 38025bc7fa
am: 805b415be6

* commit '805b415be62243e6c30dcfbcf8c6fc39f32a469f':
  Fix potential buffer overrun.

Change-Id: I5c6959756d219ddcdb200318869d781bc3d99e93