Lil-Ran/pycdc_fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity

Fix several undefined behavior issues identified by @nrathaus.

Browse Source 
Fixes #147.
This commit is contained in:
Michael Hansen
2018-01-28 14:33:26 -08:00
parent a9a362254e
commit bf60a5831b
12 changed files with 152 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pyc_code.cpp
View File

@@ -11,37 +11,51 @@ void PycCode::load(PycData* stream, PycModule* mod)
if (mod->majorVer() >= 3)
m_kwOnlyArgCount = stream->get32();
else
m_kwOnlyArgCount = 0;
if (mod->verCompare(1, 3) >= 0 && mod->verCompare(2, 3) < 0)
m_numLocals = stream->get16();
else if (mod->verCompare(2, 3) >= 0)
m_numLocals = stream->get32();
else
m_numLocals = 0;
if (mod->verCompare(1, 5) >= 0 && mod->verCompare(2, 3) < 0)
m_stackSize = stream->get16();
else if (mod->verCompare(2, 3) >= 0)
m_stackSize = stream->get32();
else
m_stackSize = 0;
if (mod->verCompare(1, 3) >= 0 && mod->verCompare(2, 3) < 0)
m_flags = stream->get16();
else if (mod->verCompare(2, 3) >= 0)
m_flags = stream->get32();
else
m_flags = 0;
m_code = LoadObject(stream, mod).cast<PycString>();
m_consts = LoadObject(stream, mod).cast<PycTuple>();
m_names = LoadObject(stream, mod).cast<PycTuple>();
m_code = LoadObject(stream, mod).require_cast<PycString>();
m_consts = LoadObject(stream, mod).require_cast<PycTuple>();
m_names = LoadObject(stream, mod).require_cast<PycTuple>();
if (mod->verCompare(1, 3) >= 0)
m_varNames = LoadObject(stream, mod).cast<PycTuple>();
m_varNames = LoadObject(stream, mod).require_cast<PycTuple>();
else
m_varNames = new PycTuple;
if (mod->verCompare(2, 1) >= 0)
m_freeVars = LoadObject(stream, mod).cast<PycTuple>();
m_freeVars = LoadObject(stream, mod).require_cast<PycTuple>();
else
m_freeVars = new PycTuple;
if (mod->verCompare(2, 1) >= 0)
m_cellVars = LoadObject(stream, mod).cast<PycTuple>();
m_cellVars = LoadObject(stream, mod).require_cast<PycTuple>();
else
m_cellVars = new PycTuple;
m_fileName = LoadObject(stream, mod).cast<PycString>();
m_name = LoadObject(stream, mod).cast<PycString>();
m_fileName = LoadObject(stream, mod).require_cast<PycString>();
m_name = LoadObject(stream, mod).require_cast<PycString>();
if (mod->verCompare(1, 5) >= 0 && mod->verCompare(2, 3) < 0)
m_firstLine = stream->get16();
@@ -49,5 +63,7 @@ void PycCode::load(PycData* stream, PycModule* mod)
m_firstLine = stream->get32();
if (mod->verCompare(1, 5) >= 0)
m_lnTable = LoadObject(stream, mod).cast<PycString>();
m_lnTable = LoadObject(stream, mod).require_cast<PycString>();
else
m_lnTable = new PycString;
}