Attached is a patch to fix the problem, and also avoid the problem with
suffix-length overfilling that buffer entirely.

This has only been lightly tested, so use at your own peril.

Jim