Apply post-1.9.0 patch from upstream to fix a segfault.
savedptr can be NULL, so guard for that.

Fixes #18741

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit ab7a23102e)