am 5f7b6b83: am 547eba0a: Merge "Avoid overflow in memccpy."

* commit '5f7b6b8301658a834516f05e8e0a9eb4513e6e62':
  Avoid overflow in memccpy.