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

* commit '63e01f731fcf4e7b14ed3fb864bbbdc49cc18f2a':
  Fix potential buffer overrun.

Change-Id: I9da77753de3597886bd2aa9443f1e0f49962920d