Comment 37 for bug 285267

This patch attempts a safer and more comprehensive fix.
The height is addressed in addition to the width, magic literals are avoided in favor of legible constants, and excessive height addition is flagged.