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

* commit 'f984fa7d59f680eabb13920aa2b4dd2cbfc8be68':
  Fix potential buffer overrun.

Change-Id: I6c172e5a2e5b1f236b61351d92dc98357a22b892