Merge pull request #2188 from JosJuice/dol-cleanup DOL loader cleanup with std::vector and safety checks
