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

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