SIGN IN SIGN UP

Issue #24802: Merge null termination fixes from 3.5

M
Martin Panter committed
9513ba3b8f0e30f88ce8e04b6da920d9237fb4ee