> Your patch fixes this crash, however it introduces a new crash when
> opening a new frame in emacs -nw. This crash is not present without your
> patch.

I see.  Please try again with the attached patch.

Thanks, martin