Bug 1044193 - Always cleanup on heap allocation path, r=glandium