Fix 0 size malloc, part 2
Ditto 7730b13e5a18c94b25642e55e39992da7921306b