Comment 68 for bug 1672297

Here's a patch to fix the biggest of the leaks.

I notice however that upstream is working on additional fixes. But those fixes are very new and experimental. What I am providing here is the more significant and mature of the leak fixes currently being proposed.