am 703c85c6: am 0c0f68e8: Fix a long standing  bug in the output buffer size computation.

Merge commit '703c85c69d3822067623a6dd7bfde4b734c7f84f'

* commit '703c85c69d3822067623a6dd7bfde4b734c7f84f':
  Fix a long standing  bug in the output buffer size computation.