Comment 5 for bug 789298

Well, if anything that's a good reason for thorough code reviews.
The segfault is produced in code that I wrote and I should have spotted the possible issue in Stefan's merge proposal. Shame on me for not reading through it this time. I'll do my best to change this in the future.

PS: Here's another confirm that your patch fixes the issue, Stefan.