This appears to fix a serie of buffer overflow. 8f11139e53/ (cherry picked from commit 4cacbf474659a9bb5af4ad8a8474f2dfda2067cf)
8f11139e53