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

* commit 'c423f55f64f430d0e56a1809db49129f03760230':
  Fix potential buffer overrun.

Change-Id: I09a8473dcbd22482cdc8015538e82d0a33d86dac