Merge change 23585 into eclair

* changes:
  Print error message if the buffer size is too small.