am 61a004c0: Merge "Fix more buffer overruns."

* commit '61a004c05f100741048d284fa527ac28c242d0bc':
  Fix more buffer overruns.