Fix out-of-bounds write am: 5403587a74 am: fb2eb86102
am: e6bd186c7e

* commit 'e6bd186c7e2a3b948fdd27a4b71048ee85229e7c':
  Fix out-of-bounds write