Andreas Klebinger authored Jul 10, 2020 and Marge Bot committed Jul 14, 2020

I also took the liberty to do away the fixed buffer size for escaping.
Using a fixed size here can only lead to issues down the line.

Fixes #18438.