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

* commit '0945199000aaa5a628705de69f17d28a5c04cc36':
  Fix out-of-bounds write