diff options
author | Lioncash <mathew1800@gmail.com> | 2018-07-22 02:54:07 -0400 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-07-22 03:22:28 -0400 |
commit | 0081252d317af44b3e810d7f31fdd3fb03b8e23c (patch) | |
tree | 4237df67a4938585d9485fc07551c470e8527dde | |
parent | 398444e67635c158a20301d1a32a1c45bfdd4056 (diff) |
vfs: Correct file_p variable usage within InterpretAsDirectory()
ReplaceFileWithSubdirectory() takes a VirtualFile and a VirtualDir, but
it was being passed a string as one of its arguments. The only reason
this never caused issues is because this template isn't instantiated
anywhere yet.
This corrects an issue before it occurs.
-rw-r--r-- | src/core/file_sys/vfs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/file_sys/vfs.h b/src/core/file_sys/vfs.h index 529c6c952..4a13b8378 100644 --- a/src/core/file_sys/vfs.h +++ b/src/core/file_sys/vfs.h @@ -205,9 +205,12 @@ struct VfsDirectory : NonCopyable { template <typename Directory> bool InterpretAsDirectory(std::string_view file) { auto file_p = GetFile(file); - if (file_p == nullptr) + + if (file_p == nullptr) { return false; - return ReplaceFileWithSubdirectory(file, std::make_shared<Directory>(file_p)); + } + + return ReplaceFileWithSubdirectory(file_p, std::make_shared<Directory>(file_p)); } protected: |