Okay, here's an updated patch which actually compiles, and I'm not getting the bug on my machine any more.
Okay, here's an updated patch which actually compiles, and I'm not getting the bug on my machine any more.