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

* commit '2304c606eb2eb9e6f21fcca0e6dcd4ac8156779a':
  Fix out-of-bounds write