am afd238af: Merge "Move overflow checks into SkipCutBuffer"

* commit 'afd238af51e92e44c7b431b8ed9e148b8d8a52d2':
  Move overflow checks into SkipCutBuffer