Fix more memory allocation issues found with failmalloc.
6 files changed