asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for large .pck files

Browse source 
An error in unix file IO was causing crashes when getting the size of a file larger than max integer size
As ftell returns a long the fix is trivial

(cherry picked from commit 8a7840a304)
This commit is contained in:
Gustav Lund 2018-04-23 15:20:38 +02:00 committed by Rémi Verschelde
parent f4c469f1b7
commit a6c9527c2f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/unix/file_access_unix.cpp
View file

@ -184,7 +184,7 @@ size_t FileAccessUnix::get_position() const {
ERR_FAIL_COND_V(!f, 0); ERR_FAIL_COND_V(!f, 0);
int pos = ftell(f); long pos = ftell(f);
if (pos < 0) { if (pos < 0) {
check_errors(); check_errors();
ERR_FAIL_V(0); ERR_FAIL_V(0);
@ -196,10 +196,10 @@ size_t FileAccessUnix::get_len() const {
ERR_FAIL_COND_V(!f, 0); ERR_FAIL_COND_V(!f, 0);
int pos = ftell(f); long pos = ftell(f);
ERR_FAIL_COND_V(pos < 0, 0); ERR_FAIL_COND_V(pos < 0, 0);
ERR_FAIL_COND_V(fseek(f, 0, SEEK_END), 0); ERR_FAIL_COND_V(fseek(f, 0, SEEK_END), 0);
int size = ftell(f); long size = ftell(f);
ERR_FAIL_COND_V(size < 0, 0); ERR_FAIL_COND_V(size < 0, 0);
ERR_FAIL_COND_V(fseek(f, pos, SEEK_SET), 0); ERR_FAIL_COND_V(fseek(f, pos, SEEK_SET), 0);