Dear all,

I intend to commit the attached patch as obvious within the next
24 hours unless there are objections.  It fixes the logic which
is intended to prevent a NULL pointer dereference on invalid
code, which is related to PR104849.  (Both PRs by Gerhard).

Co-authored by Steve.  Regtested on x86_64-pc-linux-gnu.
I plan to backport as seems appropriate.

Thanks,
Harald