Fix potential buffer overrun. am: 38025bc7fa am: 805b415be6 am: 0e17e18496 am: 8e37aa191f am: e5c4e849e2 am: 46464a20e0 am: 3bbe8817e6 am: 63e01f731f am: a0af385aae am: f984fa7d59 am: c423f55f64 am: a70e099175
am: 47b81de1b7

* commit '47b81de1b7876cdafbc092e51e4946eca57e650f':
  Fix potential buffer overrun.

Change-Id: Icec09ff9fb80d8461fcc1fd8a7c7f9373f5dec13