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

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