(It should be noted that I'm doing this on 7.6 HEAD)
On line 2209 we check if p != NULL and then dereference p on line 2234 without changing p as far as I can see. If we are going to bomb we might as well do it on 2209 and add a debug assert if it's not supposed to happen.