Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 am: 0dd00d9b19 am: 827e12087d
am: 300cd21e59

* commit '300cd21e598a965fdd7590fbf363210babc5ad54':
  Fix out-of-bounds write