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

* commit 'ad551eaa0429bf5085f2901c5d367e8a54b7ed16':
  Avoid overflow in memccpy.