Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000
am: a39f981875

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