upstream/1.0_git20220218
f52234d2 · fix null pointer arithmetic warnings ·