diff options
| author | Ryan Houdek <ryan.houdek@codethink.co.uk> | 2014-03-23 22:29:30 -0500 |
|---|---|---|
| committer | Ryan Houdek <ryan.houdek@codethink.co.uk> | 2014-03-23 22:29:30 -0500 |
| commit | 5310d6d2ea0233f745aa6fc9884930f7d30d4fee (patch) | |
| tree | a7db4eb6db0124e9ba7321ecf0abf49d5ffd7f99 /Source/Core/DiscIO | |
| parent | 9849129b5d3fef5caa308c5ee1adebc2e07cc39d (diff) | |
Fix a crash that got recently introduced.
When CFileSystemGCWii::GetFileName can't find a valid filename it would return nullptr.
nullptr as a std::string throws an assert within the std lib.
So return an empty string and check if it is empty or not
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/FileMonitor.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/DiscIO/FileSystemGCWii.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/FileMonitor.cpp b/Source/Core/DiscIO/FileMonitor.cpp index d99bd14cd8..4743e7c1af 100644 --- a/Source/Core/DiscIO/FileMonitor.cpp +++ b/Source/Core/DiscIO/FileMonitor.cpp @@ -143,6 +143,9 @@ void FindFilename(u64 offset) } const std::string filename = pFileSystem->GetFileName(offset); + + if (filename.empty()) + return; CheckFile(filename, pFileSystem->GetFileSize(filename)); } diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index f9f88e8d02..cdd830c6f6 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -60,7 +60,7 @@ const std::string CFileSystemGCWii::GetFileName(u64 _Address) } } - return nullptr; + return ""; } u64 CFileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, size_t _MaxBufferSize) |
