Merge pull request #2783 from alexanderkyte/strdup_memory_leaks