I've test driven my emacs with those patches for 2 weeks and not encountered any more segfaults.

I put them on track for NixOS' emacs 25.1 build: https://github.com/NixOS/nixpkgs/pull/20305/commits/4d3a1f53418c6c3ae5dca321ca1e8ea92a50a3f5

Thanks!