Fixed #9140 (Wrong behavior of fileRead function if bytes request exc…

…eed 10000) Bug introduced in 23f4001 (Fixed crash when using fileRead with a large count argument)
multitheftauto · Feb 8, 2016 · 99eee19 · 99eee19 · mantisbot · Feb 8, 2016
1 parent 129af8b
commit 99eee19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/MTA10/mods/shared_logic/CScriptFile.cpp b/MTA10/mods/shared_logic/CScriptFile.cpp
@@ -170,7 +170,8 @@ long CScriptFile::Read ( unsigned long ulSize, CBuffer& outBuffer )
         m_pFile->FSeek ( 0, SEEK_END );
         long lFileSize = m_pFile->FTell ();
         m_pFile->FSeek ( lCurrentPos, SEEK_SET );
-        ulSize = Min < unsigned long > ( lFileSize - lCurrentPos, ulSize );
+        ulSize = Min < unsigned long > ( 1 + lFileSize - lCurrentPos, ulSize );
+        // Note: Read extra byte at end so EOF indicator gets set
     }
 
     outBuffer.SetSize( ulSize );

diff --git a/MTA10_Server/mods/deathmatch/logic/CScriptFile.cpp b/MTA10_Server/mods/deathmatch/logic/CScriptFile.cpp
@@ -190,7 +190,8 @@ long CScriptFile::Read ( unsigned long ulSize, CBuffer& outBuffer )
         fseek ( m_pFile, 0, SEEK_END );
         long lFileSize = ftell ( m_pFile );
         fseek ( m_pFile, lCurrentPos, SEEK_SET );
-        ulSize = Min < unsigned long > ( lFileSize - lCurrentPos, ulSize );
+        ulSize = Min < unsigned long > ( 1 + lFileSize - lCurrentPos, ulSize );
+        // Note: Read extra byte at end so EOF indicator gets set
     }
 
     outBuffer.SetSize( ulSize );