etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-27 15:03:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

safeReader: Copy a value instead of direct casting

Browse source 
This fix crashes on architectures with forced alignments such as ARM
This commit is contained in:
Natt Akuma 2022-06-23 09:03:20 +07:00
parent c7ea30dda1
commit 142b8b2bb0
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/engine/safeReader.cpp
View file

@ -82,7 +82,8 @@ short SafeReader::readS() {
logD("SR: reading short %x:",curSeek);
#endif
if (curSeek+2>len) throw EndOfFileException(this,len);
short ret=*(short*)(&buf[curSeek]);
short ret;
memcpy(&ret,&buf[curSeek],2);
#ifdef READ_DEBUG
logD("SR: %.4x",ret);
#endif
@ -92,7 +93,8 @@ short SafeReader::readS() {
short SafeReader::readS_BE() {
if (curSeek+2>len) throw EndOfFileException(this,len);
short ret=*(short*)(&buf[curSeek]);
short ret;
memcpy(&ret,&buf[curSeek],2);
curSeek+=2;
return ((ret>>8)&0xff)|(ret<<8);
}
@ -102,7 +104,8 @@ int SafeReader::readI() {
logD("SR: reading int %x:",curSeek);
#endif
if (curSeek+4>len) throw EndOfFileException(this,len);
int ret=*(int*)(&buf[curSeek]);
int ret;
memcpy(&ret,&buf[curSeek],4);
curSeek+=4;
#ifdef READ_DEBUG
logD("SR: %.8x",ret);
@ -112,28 +115,32 @@ int SafeReader::readI() {
int SafeReader::readI_BE() {
if (curSeek+4>len) throw EndOfFileException(this,len);
unsigned int ret=*(unsigned int*)(&buf[curSeek]);
unsigned int ret;
memcpy(&ret,&buf[curSeek],4);
curSeek+=4;
return (int)((ret>>24)|((ret&0xff0000)>>8)|((ret&0xff00)<<8)|((ret&0xff)<<24));
}
int64_t SafeReader::readL() {
if (curSeek+8>len) throw EndOfFileException(this,len);
int64_t ret=*(int64_t*)(&buf[curSeek]);
int64_t ret;
memcpy(&ret,&buf[curSeek],8);
curSeek+=8;
return ret;
}
float SafeReader::readF() {
if (curSeek+4>len) throw EndOfFileException(this,len);
float ret=*(float*)(&buf[curSeek]);
float ret;
memcpy(&ret,&buf[curSeek],4);
curSeek+=4;
return ret;
}
double SafeReader::readD() {
if (curSeek+8>len) throw EndOfFileException(this,len);
double ret=*(double*)(&buf[curSeek]);
double ret;
memcpy(&ret,&buf[curSeek],8);
curSeek+=8;
return ret;
}