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

* commit '547eba0a63951d7db93c0542e1ecab891725b9a8':
  Avoid overflow in memccpy.