branches: 1.15.4; 1.15.10;replace questionable pointer games which could cause reads ofuninitialized memory, from Wolfgang Stukenbrock per PR bin/44951