fs: fix out of bounds access when parsing directory paths

2022-03-23 13:38:34 -07:00
parent 596a0f2551
commit 6f54ab5716
2 changed files with 5 additions and 6 deletions
--- a/libraries/libstratosphere/include/stratosphere/fs/common/fs_directory_path_parser.hpp
+++ b/libraries/libstratosphere/include/stratosphere/fs/common/fs_directory_path_parser.hpp
@@ -101,10 +101,9 @@ namespace ams::fs {
                s32 i;
                for (i = m_position; m_buffer[i] != StringTraits::DirectorySeparator; ++i) {
                    if (m_buffer[i] == StringTraits::NullTerminator) {
-                        if (i == m_position) {
-                            m_position = -1;
-                            return nullptr;
-                        }
+                        char * const ret = (i != m_position) ? m_buffer + m_position : nullptr;
+                        m_position = -1;
+                        return ret;
                    }
                }