Comment 7 for bug 1974195

I pushed the change to master, rel_3_9, rel_3_8, and rel_3_7.

I think this patch would warrant a 3.7.4 release as a pseudo-security update. This bug could lead to crashing of services, though it seems to be rare in practice.

Thanks, Galen!