Comment 26 for bug 308060

Thanks Aurélien! I adjusted the switch statement to check length on each case (so we couldn't overflow in the middle of the cascade through the statements).

I also added patch tagging to the header, for Ubuntu's own tracking. If this passes your tests, then, yes, it should go upstream.