MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix C string idiocy.

develop
Petr Mrázek 2011-03-28 02:09:13 +02:00
parent bf0bd7c2dd
commit cfd309bf70
6 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
library/DFProcess-SHM.cpp
Unescape Escape View File

@ -221,7 +221,7 @@ bool SHMProcess::resume()
// get module index by name and version. bool 0 = error // get module index by name and version. bool 0 = error
bool SHMProcess::getModuleIndex (const char * name, const uint32_t version, uint32_t & OUTPUT) bool SHMProcess::getModuleIndex (const char * name, const uint32_t version, uint32_t & OUTPUT)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(0xdeadbeef);
modulelookup * payload = D_SHMDATA(modulelookup); modulelookup * payload = D_SHMDATA(modulelookup);
payload->version = version; payload->version = version;
@ -244,7 +244,7 @@ bool SHMProcess::getModuleIndex (const char * name, const uint32_t version, uint
bool SHMProcess::Private::Aux_Core_Attach(bool & versionOK, pid_t & PID) bool SHMProcess::Private::Aux_Core_Attach(bool & versionOK, pid_t & PID)
{ {
if(!locked) throw Error::MemoryAccessDenied(); if(!locked) throw Error::MemoryAccessDenied(0xdeadbeef);
SHMDATA(coreattach)->cl_affinity = OS_getAffinity(); SHMDATA(coreattach)->cl_affinity = OS_getAffinity();
if(!SetAndWait(CORE_ATTACH)) return false; if(!SetAndWait(CORE_ATTACH)) return false;
@ -263,7 +263,7 @@ bool SHMProcess::Private::Aux_Core_Attach(bool & versionOK, pid_t & PID)
void SHMProcess::read (uint32_t src_address, uint32_t size, uint8_t *target_buffer) void SHMProcess::read (uint32_t src_address, uint32_t size, uint8_t *target_buffer)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(src_address);
// normal read under 1MB // normal read under 1MB
if(size <= SHM_BODY) if(size <= SHM_BODY)
@ -300,7 +300,7 @@ void SHMProcess::read (uint32_t src_address, uint32_t size, uint8_t *target_buff
void SHMProcess::readByte (const uint32_t offset, uint8_t &val ) void SHMProcess::readByte (const uint32_t offset, uint8_t &val )
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
full_barrier full_barrier
@ -310,7 +310,7 @@ void SHMProcess::readByte (const uint32_t offset, uint8_t &val )
void SHMProcess::readWord (const uint32_t offset, uint16_t &val) void SHMProcess::readWord (const uint32_t offset, uint16_t &val)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
full_barrier full_barrier
@ -320,7 +320,7 @@ void SHMProcess::readWord (const uint32_t offset, uint16_t &val)
void SHMProcess::readDWord (const uint32_t offset, uint32_t &val) void SHMProcess::readDWord (const uint32_t offset, uint32_t &val)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
full_barrier full_barrier
@ -330,7 +330,7 @@ void SHMProcess::readDWord (const uint32_t offset, uint32_t &val)
void SHMProcess::readQuad (const uint32_t offset, uint64_t &val) void SHMProcess::readQuad (const uint32_t offset, uint64_t &val)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
full_barrier full_barrier
@ -340,7 +340,7 @@ void SHMProcess::readQuad (const uint32_t offset, uint64_t &val)
void SHMProcess::readFloat (const uint32_t offset, float &val) void SHMProcess::readFloat (const uint32_t offset, float &val)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
full_barrier full_barrier
@ -354,7 +354,7 @@ void SHMProcess::readFloat (const uint32_t offset, float &val)
void SHMProcess::writeQuad (uint32_t offset, uint64_t data) void SHMProcess::writeQuad (uint32_t offset, uint64_t data)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
D_SHMHDR->Qvalue = data; D_SHMHDR->Qvalue = data;
@ -364,7 +364,7 @@ void SHMProcess::writeQuad (uint32_t offset, uint64_t data)
void SHMProcess::writeDWord (uint32_t offset, uint32_t data) void SHMProcess::writeDWord (uint32_t offset, uint32_t data)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
D_SHMHDR->value = data; D_SHMHDR->value = data;
@ -375,7 +375,7 @@ void SHMProcess::writeDWord (uint32_t offset, uint32_t data)
// using these is expensive. // using these is expensive.
void SHMProcess::writeWord (uint32_t offset, uint16_t data) void SHMProcess::writeWord (uint32_t offset, uint16_t data)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
D_SHMHDR->value = data; D_SHMHDR->value = data;
@ -385,7 +385,7 @@ void SHMProcess::writeWord (uint32_t offset, uint16_t data)
void SHMProcess::writeByte (uint32_t offset, uint8_t data) void SHMProcess::writeByte (uint32_t offset, uint8_t data)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
D_SHMHDR->value = data; D_SHMHDR->value = data;
@ -395,7 +395,7 @@ void SHMProcess::writeByte (uint32_t offset, uint8_t data)
void SHMProcess::write (uint32_t dst_address, uint32_t size, uint8_t *source_buffer) void SHMProcess::write (uint32_t dst_address, uint32_t size, uint8_t *source_buffer)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(dst_address);
// normal write under 1MB // normal write under 1MB
if(size <= SHM_BODY) if(size <= SHM_BODY)
@ -430,29 +430,24 @@ void SHMProcess::write (uint32_t dst_address, uint32_t size, uint8_t *source_buf
} }
} }
// FIXME: butt-fugly
const std::string SHMProcess::readCString (uint32_t offset) const std::string SHMProcess::readCString (uint32_t offset)
{ {
if(!d->locked) throw Error::MemoryAccessDenied();
std::string temp; std::string temp;
char temp_c[256];
int counter = 0; int counter = 0;
char r; char r;
do while (1)
{ {
r = Process::readByte(offset+counter); r = Process::readByte(offset+counter);
temp_c[counter] = r; if(!r) break;
counter++; counter++;
} while (r && counter < 255); temp.append(1,r);
temp_c[counter] = 0; }
temp = temp_c;
return temp; return temp;
} }
const std::string SHMProcess::readSTLString(uint32_t offset) const std::string SHMProcess::readSTLString(uint32_t offset)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
full_barrier full_barrier
@ -462,7 +457,7 @@ const std::string SHMProcess::readSTLString(uint32_t offset)
size_t SHMProcess::readSTLString (uint32_t offset, char * buffer, size_t bufcapacity) size_t SHMProcess::readSTLString (uint32_t offset, char * buffer, size_t bufcapacity)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(offset);
D_SHMHDR->address = offset; D_SHMHDR->address = offset;
full_barrier full_barrier
@ -476,7 +471,7 @@ size_t SHMProcess::readSTLString (uint32_t offset, char * buffer, size_t bufcapa
void SHMProcess::writeSTLString(const uint32_t address, const std::string writeString) void SHMProcess::writeSTLString(const uint32_t address, const std::string writeString)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(address);
D_SHMHDR->address = address; D_SHMHDR->address = address;
strncpy(D_SHMDATA(char),writeString.c_str(),writeString.length()+1); // length + 1 for the null terminator strncpy(D_SHMDATA(char),writeString.c_str(),writeString.length()+1); // length + 1 for the null terminator

2
library/DFProcess-linux-SHM.cpp
Unescape Escape View File

@ -377,7 +377,7 @@ void SHMProcess::readSTLVector(const uint32_t address, t_vecTriplet & triplet)
string SHMProcess::readClassName (uint32_t vptr) string SHMProcess::readClassName (uint32_t vptr)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(vptr);
int typeinfo = Process::readDWord(vptr - 0x4); int typeinfo = Process::readDWord(vptr - 0x4);
int typestring = Process::readDWord(typeinfo + 0x4); int typestring = Process::readDWord(typeinfo + 0x4);

12
library/DFProcess-linux-base.cpp
Unescape Escape View File

@ -121,7 +121,7 @@ void LinuxProcessBase::read (const uint32_t offset, const uint32_t size, uint8_t
cerr << "pread failed: can't read " << size << " bytes at addres " << offset << endl; cerr << "pread failed: can't read " << size << " bytes at addres " << offset << endl;
cerr << "errno: " << errno << endl; cerr << "errno: " << errno << endl;
errno = 0; errno = 0;
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
else else
{ {
@ -258,17 +258,15 @@ void LinuxProcessBase::write (uint32_t offset, uint32_t size, uint8_t *source)
const std::string LinuxProcessBase::readCString (uint32_t offset) const std::string LinuxProcessBase::readCString (uint32_t offset)
{ {
std::string temp; std::string temp;
char temp_c[256];
int counter = 0; int counter = 0;
char r; char r;
do while (1)
{ {
r = Process::readByte(offset+counter); r = Process::readByte(offset+counter);
temp_c[counter] = r; if(!r) break;
counter++; counter++;
} while (r && counter < 255); temp.append(1,r);
temp_c[counter] = 0; }
temp = temp_c;
return temp; return temp;
} }

2
library/DFProcess-windows-SHM.cpp
Unescape Escape View File

@ -408,7 +408,7 @@ string SHMProcess::getPath()
char * SHMProcess::getSHMStart (void) char * SHMProcess::getSHMStart (void)
{ {
if(!d->locked) throw Error::MemoryAccessDenied(); if(!d->locked) throw Error::MemoryAccessDenied(0xdeadbeef);
return d->shm_addr; return d->shm_addr;
} }

47
library/DFProcess-windows.cpp
Unescape Escape View File

@ -441,82 +441,87 @@ void NormalProcess::getMemRanges( vector<t_memrange> & ranges )
void NormalProcess::readByte (const uint32_t offset,uint8_t &result) void NormalProcess::readByte (const uint32_t offset,uint8_t &result)
{ {
if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(uint8_t), NULL)) if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(uint8_t), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
void NormalProcess::readWord (const uint32_t offset, uint16_t &result) void NormalProcess::readWord (const uint32_t offset, uint16_t &result)
{ {
if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(uint16_t), NULL)) if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(uint16_t), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
void NormalProcess::readDWord (const uint32_t offset, uint32_t &result) void NormalProcess::readDWord (const uint32_t offset, uint32_t &result)
{ {
if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(uint32_t), NULL)) if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(uint32_t), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
void NormalProcess::readQuad (const uint32_t offset, uint64_t &result) void NormalProcess::readQuad (const uint32_t offset, uint64_t &result)
{ {
if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(uint64_t), NULL)) if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(uint64_t), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
void NormalProcess::readFloat (const uint32_t offset, float &result) void NormalProcess::readFloat (const uint32_t offset, float &result)
{ {
if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(float), NULL)) if(!ReadProcessMemory(my_handle, (int*) offset, &result, sizeof(float), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
void NormalProcess::read (const uint32_t offset, uint32_t size, uint8_t *target) void NormalProcess::read (const uint32_t offset, uint32_t size, uint8_t *target)
{ {
if(!ReadProcessMemory(my_handle, (int*) offset, target, size, NULL)) if(!ReadProcessMemory(my_handle, (int*) offset, target, size, NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
// WRITING // WRITING
void NormalProcess::writeQuad (const uint32_t offset, uint64_t data) void NormalProcess::writeQuad (const uint32_t offset, uint64_t data)
{ {
if(!WriteProcessMemory(my_handle, (int*) offset, &data, sizeof(data), NULL)) if(!WriteProcessMemory(my_handle, (int*) offset, &data, sizeof(data), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
void NormalProcess::writeDWord (const uint32_t offset, uint32_t data) void NormalProcess::writeDWord (const uint32_t offset, uint32_t data)
{ {
if(!WriteProcessMemory(my_handle, (int*) offset, &data, sizeof(data), NULL)) if(!WriteProcessMemory(my_handle, (int*) offset, &data, sizeof(data), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
// using these is expensive. // using these is expensive.
void NormalProcess::writeWord (uint32_t offset, uint16_t data) void NormalProcess::writeWord (uint32_t offset, uint16_t data)
{ {
if(!WriteProcessMemory(my_handle, (int*) offset, &data, sizeof(data), NULL)) if(!WriteProcessMemory(my_handle, (int*) offset, &data, sizeof(data), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
void NormalProcess::writeByte (uint32_t offset, uint8_t data) void NormalProcess::writeByte (uint32_t offset, uint8_t data)
{ {
if(!WriteProcessMemory(my_handle, (int*) offset, &data, sizeof(data), NULL)) if(!WriteProcessMemory(my_handle, (int*) offset, &data, sizeof(data), NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
void NormalProcess::write (uint32_t offset, uint32_t size, uint8_t *source) void NormalProcess::write (uint32_t offset, uint32_t size, uint8_t *source)
{ {
if(!WriteProcessMemory(my_handle, (int*) offset, source, size, NULL)) if(!WriteProcessMemory(my_handle, (int*) offset, source, size, NULL))
throw Error::MemoryAccessDenied(); throw Error::MemoryAccessDenied(offset);
} }
///FIXME: reduce use of temporary objects // FIXME: could exploit the fact we can read more than one byte... but still, this is almost unused.
const string NormalProcess::readCString (const uint32_t offset) const std::string NormalProcess::readCString (const uint32_t offset)
{ {
string temp; std::string temp;
char temp_c[256]; int counter = 0;
SIZE_T read; char r;
if(!ReadProcessMemory(my_handle, (int *) offset, temp_c, 254, &read)) while (1)
throw Error::MemoryAccessDenied(); {
// needs to be 254+1 byte for the null term if(!ReadProcessMemory(my_handle, (int*) (offset + counter), &r, sizeof(uint8_t), NULL)) break;
temp_c[read+1] = 0; r = Process::readByte(offset+counter);
temp.assign(temp_c); if(!r) break;
counter++;
temp.append(1,r);
}
if(!counter)
throw Error::MemoryAccessDenied(offset);
return temp; return temp;
} }

10
library/include/dfhack/DFError.h
Unescape Escape View File

@ -329,11 +329,17 @@ namespace DFHack
class DFHACK_EXPORT MemoryAccessDenied : public All class DFHACK_EXPORT MemoryAccessDenied : public All
{ {
public: public:
MemoryAccessDenied() {} std::string descr;
MemoryAccessDenied(uint64_t address)
{
std::stringstream s;
s << "Invalid memory access @0x" << std::hex << address;
descr = s.str();
}
virtual ~MemoryAccessDenied() throw(){}; virtual ~MemoryAccessDenied() throw(){};
virtual const char* what() const throw() virtual const char* what() const throw()
{ {
return "SHM ACCESS DENIED"; return descr.c_str();
} }
}; };
class DFHACK_EXPORT SHMVersionMismatch : public All class DFHACK_EXPORT SHMVersionMismatch : public All