Ported across from a nearly identical fix to the glibc tree.  Under
some conditions we'd read one too many source words and segfault.