Take buffer overflow bug into security fixes branch