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

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