Here is a patch that removes the superfluous line with a detailed explanation in the commit message. I've tested it in combination (also in combination with my "hidpi fringe" patches) and got no segv yet ;)