am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrun

* commit '3fdb2cbb16e7c347d8013cb85b5d29f106c50cf9':
  Fix potential buffer overrun