Merge "Fix leak of FILE* in dumping"