Filesystem: replaced return type for elapsed() function to intptr_t

This fixes critical bug with EOF check
OpenXRay · Jul 6, 2019 · a815afb · a815afb
1 parent ec743e9
commit a815afb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/utils/xrLC_Light/net_stream.h b/src/utils/xrLC_Light/net_stream.h
@@ -141,7 +141,7 @@ class XRLC_LIGHT_API INetReader : public IReaderBase<INetReader>, public byte_co
         // VERIFY(stream);
     }
     virtual ~INetReader();
-    IC size_t elapsed() const
+    IC intptr_t elapsed() const
     {
         VERIFY(false);
         return 0;

diff --git a/src/xrCore/FS.h b/src/xrCore/FS.h
@@ -366,7 +366,7 @@ class XRCORE_API IReader : public IReaderBase<IReader>
     size_t advance_term_string();
 
 public:
-    IC size_t elapsed() const { return Size - Pos; }
+    IC intptr_t elapsed() const { return Size - Pos; }
     IC size_t tell() const { return Pos; }
     IC void seek(size_t ptr)
     {

diff --git a/src/xrCore/stream_reader.h b/src/xrCore/stream_reader.h
@@ -44,7 +44,7 @@ class XRCORE_API CStreamReader : public IReaderBase<CStreamReader>, Noncopyable
 #elif defined(LINUX) || defined(FREEBSD)
     IC const int& file_mapping_handle() const;
 #endif
-    IC size_t elapsed() const;
+    IC intptr_t elapsed() const;
     IC const size_t& length() const;
     IC void seek(const int& offset);
     IC size_t tell() const;

diff --git a/src/xrCore/stream_reader_inline.h b/src/xrCore/stream_reader_inline.h
@@ -21,7 +21,7 @@ IC void CStreamReader::remap(const size_t& new_offset)
     map(new_offset);
 }
 
-IC size_t CStreamReader::elapsed() const
+IC intptr_t CStreamReader::elapsed() const
 {
     const size_t offset_from_file_start = tell();
     VERIFY(m_file_size >= offset_from_file_start);