Be more careful about dmalloc handling
2 files changed