Bug 40010 - rebuild with gcc10 exposes buggy code (with garbage in strings)

Summary: rebuild with gcc10 exposes buggy code (with garbage in strings)