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

* commit 'd638e73568fa43eb964a305ed438603ae5900264':
  Fix potential buffer overrun