Lil-Ran/Pyarmor-Static-Unpack-1shot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use std::string instead of manual character buffers where applicable.

Browse Source
This commit is contained in:
Michael Hansen
2019-10-02 16:01:54 -07:00
parent 8d3752b4f0
commit f88869fb17
5 changed files with 45 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pyc_numeric.cpp
View File

@@ -98,14 +98,12 @@ std::string PycLong::repr() const
void PycFloat::load(PycData* stream, PycModule*)
{
int len = stream->getByte();
delete[] m_value;
if (len > 0) {
m_value = new char[len+1];
stream->getBuffer(len, m_value);
m_value[len] = 0;
} else {
m_value = 0;
}
if (len < 0)
throw std::bad_alloc();
m_value.resize(len);
if (len > 0)
stream->getBuffer(len, &m_value.front());
}
bool PycFloat::isEqual(PycRef<PycObject> obj) const
@@ -114,9 +112,7 @@ bool PycFloat::isEqual(PycRef<PycObject> obj) const
return false;
PycRef<PycFloat> floatObj = obj.cast<PycFloat>();
if (m_value == floatObj->m_value)
return true;
return (strcmp(m_value, floatObj->m_value) == 0);
return m_value == floatObj->m_value;
}
@@ -126,14 +122,12 @@ void PycComplex::load(PycData* stream, PycModule* mod)
PycFloat::load(stream, mod);
int len = stream->getByte();
delete[] m_imag;
if (len > 0) {
m_imag = new char[len+1];
stream->getBuffer(len, m_imag);
m_imag[len] = 0;
} else {
m_imag = 0;
}
if (len < 0)
throw std::bad_alloc();
m_imag.resize(len);
if (len > 0)
stream->getBuffer(len, &m_imag.front());
}
bool PycComplex::isEqual(PycRef<PycObject> obj) const
@@ -142,9 +136,7 @@ bool PycComplex::isEqual(PycRef<PycObject> obj) const
return false;
PycRef<PycComplex> floatObj = obj.cast<PycComplex>();
if (m_imag == floatObj->m_imag)
return true;
return (strcmp(m_imag, floatObj->m_imag) == 0);
return m_imag == floatObj->m_imag;
}