miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

memory fixes and cleanup

Browse Source 
git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@120 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
This commit is contained in:
albertzeyer
2009-07-23 09:42:52 +00:00
parent e97cfecce3
commit f1a30250bf
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/fileio/CExeFile.cpp
View File

@@ -21,13 +21,11 @@ CExeFile::CExeFile(int episode, const std::string& datadirectory) {
}
CExeFile::~CExeFile() {
if(m_data) delete m_data;
if(m_data) delete[] m_data; m_data = NULL;
}
bool CExeFile::readData()
{
unsigned char *m_data_temp;
std::string filename = "data/" + m_datadirectory + "keen" + itoa(m_episode) + ".exe";
std::ifstream File(filename.c_str(),ios::binary);
@@ -38,7 +36,7 @@ bool CExeFile::readData()
m_datasize = File.tellg();
File.seekg(0,ios::beg);
m_data_temp = new unsigned char[m_datasize];
unsigned char * m_data_temp = new unsigned char[m_datasize];
File.read((char*)m_data_temp, m_datasize);
File.close();
@@ -57,17 +55,15 @@ bool CExeFile::readData()
m_data = new unsigned char[m_datasize];
memcpy(m_data, m_data_temp+512,m_datasize);
}
delete m_data_temp;
delete[] m_data_temp;
return true;
}
int CExeFile::get_bit(int *p_bit_count, unsigned char *fin, int *posin)
{
static unsigned short bits;
int bit;
bit = bits & 1;
static unsigned short bits = 0;
int bit = bits & 1;
(*p_bit_count)--;
if ((*p_bit_count) <= 0)
@@ -94,13 +90,12 @@ int CExeFile::get_bit(int *p_bit_count, unsigned char *fin, int *posin)
// return how much was unpacked or zero if nothing was unpacked
int CExeFile::unlzexe(unsigned char *fin, vector<unsigned char> *outbuffer)
{
int bit_count;
short offset;
int pos, repeat;
int repeat;
int posin = 0; // position of input
pos = 0;
bit_count = 0;
int pos = 0;
int bit_count = 0;
/* skip header */
posin = 32;