Created attachment 144311 [details] [review]
wip patch

The following patch (applied on top of the problematic commit 78e35df52a) seems
to fix the corruption problem (but I don't know the code enough to decide if
it's a correct fix).