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

Support new marshal types from Python 3.4

Browse Source
This commit is contained in:
Michael Hansen
2014-01-21 00:07:34 -08:00
parent 6ecbcfb564
commit 176a049a68
9 changed files with 131 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ASTree.cpp
View File

@@ -1223,7 +1223,8 @@ PycRef<ASTNode> BuildFromCode(PycRef<PycCode> code, PycModule* mod)
{
PycRef<ASTObject> t_ob = new ASTObject(code->getConst(operand));
if (t_ob->object()->type() == PycObject::TYPE_TUPLE &&
if ((t_ob->object()->type() == PycObject::TYPE_TUPLE ||
t_ob->object()->type() == PycObject::TYPE_SMALL_TUPLE) &&
!t_ob->object().cast<PycTuple>()->values().size()) {
ASTTuple::value_t values;
stack.push(new ASTTuple(values));
@@ -2618,7 +2619,8 @@ void print_src(PycRef<ASTNode> node, PycModule* mod)
else
print_src(import->name(), mod);
fprintf(pyc_output, " import ");
if (fromlist->type() == PycObject::TYPE_TUPLE) {
if (fromlist->type() == PycObject::TYPE_TUPLE ||
fromlist->type() == PycObject::TYPE_SMALL_TUPLE) {
bool first = true;
PycTuple::value_t::const_iterator ii = fromlist.cast<PycTuple>()->values().begin();
for (; ii != fromlist.cast<PycTuple>()->values().end(); ++ii) {
@@ -2656,6 +2658,10 @@ void print_src(PycRef<ASTNode> node, PycModule* mod)
PycRef<PycObject> obj = src.cast<ASTObject>()->object();
if (obj->type() == PycObject::TYPE_STRING ||
obj->type() == PycObject::TYPE_INTERNED ||
obj->type() == PycObject::TYPE_ASCII ||
obj->type() == PycObject::TYPE_ASCII_INTERNED ||
obj->type() == PycObject::TYPE_SHORT_ASCII ||
obj->type() == PycObject::TYPE_SHORT_ASCII_INTERNED ||
obj->type() == PycObject::TYPE_STRINGREF)
OutputString(obj.cast<PycString>(), (mod->majorVer() == 3) ? 'b' : 0, true);
else if (obj->type() == PycObject::TYPE_UNICODE)

5
bytecode.cpp
View File

@@ -160,12 +160,17 @@ void print_const(PycRef<PycObject> obj, PycModule* mod)
case PycObject::TYPE_STRING:
case PycObject::TYPE_STRINGREF:
case PycObject::TYPE_INTERNED:
case PycObject::TYPE_ASCII:
case PycObject::TYPE_ASCII_INTERNED:
case PycObject::TYPE_SHORT_ASCII:
case PycObject::TYPE_SHORT_ASCII_INTERNED:
OutputString(obj.cast<PycString>(), (mod->majorVer() == 3) ? 'b' : 0);
break;
case PycObject::TYPE_UNICODE:
OutputString(obj.cast<PycString>(), (mod->majorVer() == 3) ? 0 : 'u');
break;
case PycObject::TYPE_TUPLE:
case PycObject::TYPE_SMALL_TUPLE:
{
fprintf(pyc_output, "(");
PycTuple::value_t values = obj.cast<PycTuple>()->values();

13
pyc_module.cpp
View File

@@ -155,9 +155,18 @@ void PycModule::loadFromFile(const char* filename)
m_code = LoadObject(&in, this).cast<PycCode>();
}
PycRef<PycString> PycModule::getIntern(int ref)
PycRef<PycString> PycModule::getIntern(int ref) const
{
std::list<PycRef<PycString> >::const_iterator it = m_interns.begin();
for (int i=0; i<ref; i++, it++) /* move forward to ref */ ;
while (ref--)
++it;
return *it;
}
PycRef<PycObject> PycModule::getRef(int ref) const
{
std::list<PycRef<PycObject> >::const_iterator it = m_refs.begin();
while (ref--)
++it;
return *it;
}

6
pyc_module.h
View File

@@ -52,7 +52,10 @@ public:
PycRef<PycCode> code() const { return m_code; }
void intern(PycRef<PycString> str) { m_interns.push_back(str); }
PycRef<PycString> getIntern(int ref);
PycRef<PycString> getIntern(int ref) const;
void refObject(PycRef<PycObject> str) { m_refs.push_back(str); }
PycRef<PycObject> getRef(int ref) const;
private:
void setVersion(unsigned int magic);
@@ -63,6 +66,7 @@ private:
PycRef<PycCode> m_code;
std::list<PycRef<PycString> > m_interns;
std::list<PycRef<PycObject> > m_refs;
};
#endif

37
pyc_object.cpp
View File

@@ -30,7 +30,7 @@ PycRef<PycObject> CreateObject(int type)
case PycObject::TYPE_INT:
return new PycInt();
case PycObject::TYPE_INT64:
return new PycLong(PycObject::TYPE_INT64);
return new PycLong(type);
case PycObject::TYPE_FLOAT:
return new PycFloat();
case PycObject::TYPE_BINARY_FLOAT:
@@ -42,13 +42,17 @@ PycRef<PycObject> CreateObject(int type)
case PycObject::TYPE_LONG:
return new PycLong();
case PycObject::TYPE_STRING:
return new PycString();
case PycObject::TYPE_INTERNED:
return new PycString(PycObject::TYPE_INTERNED);
case PycObject::TYPE_STRINGREF:
return new PycString(PycObject::TYPE_STRINGREF);
case PycObject::TYPE_UNICODE:
case PycObject::TYPE_ASCII:
case PycObject::TYPE_ASCII_INTERNED:
case PycObject::TYPE_SHORT_ASCII:
case PycObject::TYPE_SHORT_ASCII_INTERNED:
return new PycString(type);
case PycObject::TYPE_TUPLE:
return new PycTuple();
case PycObject::TYPE_SMALL_TUPLE:
return new PycTuple(type);
case PycObject::TYPE_LIST:
return new PycList();
case PycObject::TYPE_DICT:
@@ -56,12 +60,9 @@ PycRef<PycObject> CreateObject(int type)
case PycObject::TYPE_CODE:
case PycObject::TYPE_CODE2:
return new PycCode();
case PycObject::TYPE_UNICODE:
return new PycString(PycObject::TYPE_UNICODE);
case PycObject::TYPE_SET:
return new PycSet();
case PycObject::TYPE_FROZENSET:
return new PycSet(PycObject::TYPE_FROZENSET);
return new PycSet(type);
default:
fprintf(stderr, "CreateObject: Got unsupported type 0x%X\n", type);
return Pyc_NULL;
@@ -70,8 +71,20 @@ PycRef<PycObject> CreateObject(int type)
PycRef<PycObject> LoadObject(PycData* stream, PycModule* mod)
{
PycRef<PycObject> obj = CreateObject(stream->getByte());
if (obj != Pyc_NULL)
obj->load(stream, mod);
int type = stream->getByte();
PycRef<PycObject> obj;
if (type == PycObject::TYPE_OBREF) {
int index = stream->get32();
obj = mod->getRef(index);
} else {
obj = CreateObject(type & 0x7F);
if (obj != Pyc_NULL) {
if (type & 0x80)
mod->refObject(obj);
obj->load(stream, mod);
}
}
return obj;
}

23
pyc_object.h
View File

@@ -8,19 +8,19 @@ public:
PycRef(_Obj* obj) : m_obj(obj)
{
if(m_obj)
if (m_obj)
m_obj->addRef();
}
PycRef(const PycRef<_Obj>& obj) : m_obj(obj.m_obj)
{
if(m_obj)
if (m_obj)
m_obj->addRef();
}
~PycRef<_Obj>()
{
if(m_obj)
if (m_obj)
m_obj->delRef();
}
@@ -62,6 +62,9 @@ private:
};
class PycData;
class PycModule;
/* Please only hold PycObjects inside PycRefs! */
class PycObject {
public:
@@ -83,6 +86,7 @@ public:
TYPE_STRING = 's',
TYPE_INTERNED = 't',
TYPE_STRINGREF = 'R',
TYPE_OBREF = 'r',
TYPE_TUPLE = '(',
TYPE_LIST = '[',
TYPE_DICT = '{',
@@ -92,6 +96,11 @@ public:
TYPE_UNKNOWN = '?',
TYPE_SET = '<',
TYPE_FROZENSET = '>',
TYPE_ASCII = 'a',
TYPE_ASCII_INTERNED = 'A',
TYPE_SMALL_TUPLE = ')',
TYPE_SHORT_ASCII = 'z',
TYPE_SHORT_ASCII_INTERNED = 'Z',
};
PycObject(int type = TYPE_UNKNOWN) : m_refs(0), m_type(type) { }
@@ -102,19 +111,19 @@ public:
virtual bool isEqual(PycRef<PycObject> obj) const
{ return (this == (PycObject*)obj); }
virtual void load(class PycData*, class PycModule*) { }
virtual void load(PycData*, PycModule*) { }
private:
int m_refs;
int m_type;
public:
void addRef() { if (this) ++m_refs; }
void delRef() { if (this && --m_refs == 0) delete this; }
void addRef() { ++m_refs; }
void delRef() { if (--m_refs == 0) delete this; }
};
PycRef<PycObject> CreateObject(int type);
PycRef<PycObject> LoadObject(class PycData* stream, class PycModule* mod);
PycRef<PycObject> LoadObject(PycData* stream, PycModule* mod);
/* Static Singleton objects */
extern PycRef<PycObject> Pyc_NULL;

6
pyc_sequence.cpp
View File

@@ -5,7 +5,11 @@
/* PycTuple */
void PycTuple::load(PycData* stream, PycModule* mod)
{
m_size = stream->get32();
if (type() == TYPE_SMALL_TUPLE)
m_size = stream->getByte();
else
m_size = stream->get32();
m_values.resize(m_size);
for (int i=0; i<m_size; i++)
m_values[i] = LoadObject(stream, mod);

53
pyc_string.cpp
View File

@@ -3,6 +3,46 @@
#include "data.h"
#include <cstring>
static void ascii_to_utf8(char** data)
{
size_t utf8len = 0, asciilen = 0;
unsigned char* cp = reinterpret_cast<unsigned char*>(*data);
while (*cp) {
if (*cp & 0x80)
utf8len += 2;
else
utf8len += 1;
// Advance ASCII pointer
++asciilen;
++cp;
}
if (asciilen == utf8len) {
// This can only happen if all characters are [0x00-0x7f].
// If that happens, we don't need to do any conversion, nor
// reallocate any buffers. Woot!
return;
}
char* utf8_buffer = new char[utf8len + 1];
unsigned char* up = reinterpret_cast<unsigned char*>(utf8_buffer);
cp = reinterpret_cast<unsigned char*>(*data);
while (*cp) {
if (*cp & 0x80) {
*up++ = 0xC0 | ((*cp >> 6) & 0x1F);
*up++ = 0x80 | ((*cp ) & 0x3F);
} else {
*up++ = *cp;
}
++cp;
}
utf8_buffer[utf8len] = 0;
delete[] *data;
*data = utf8_buffer;
}
/* PycString */
void PycString::load(PycData* stream, PycModule* mod)
{
@@ -20,16 +60,25 @@ void PycString::load(PycData* stream, PycModule* mod)
m_value = 0;
}
} else {
m_length = stream->get32();
if (type() == TYPE_SHORT_ASCII || type() == TYPE_SHORT_ASCII_INTERNED)
m_length = stream->getByte();
else
m_length = stream->get32();
if (m_length) {
m_value = new char[m_length+1];
stream->getBuffer(m_length, m_value);
m_value[m_length] = 0;
if (type() == TYPE_ASCII || type() == TYPE_ASCII_INTERNED ||
type() == TYPE_SHORT_ASCII || type() == TYPE_SHORT_ASCII_INTERNED)
ascii_to_utf8(&m_value);
} else {
m_value = 0;
}
if (type() == TYPE_INTERNED)
if (type() == TYPE_INTERNED || type() == TYPE_ASCII_INTERNED ||
type() == TYPE_SHORT_ASCII_INTERNED)
mod->intern(this);
}
}

5
pycdas.cpp
View File

@@ -115,6 +115,10 @@ void output_object(PycRef<PycObject> obj, PycModule* mod, int indent)
case PycObject::TYPE_STRING:
case PycObject::TYPE_STRINGREF:
case PycObject::TYPE_INTERNED:
case PycObject::TYPE_ASCII:
case PycObject::TYPE_ASCII_INTERNED:
case PycObject::TYPE_SHORT_ASCII:
case PycObject::TYPE_SHORT_ASCII_INTERNED:
iprintf(indent, "");
OutputString(obj.cast<PycString>(), (mod->majorVer() == 3) ? 'b' : 0);
fprintf(pyc_output, "\n");
@@ -125,6 +129,7 @@ void output_object(PycRef<PycObject> obj, PycModule* mod, int indent)
fprintf(pyc_output, "\n");
break;
case PycObject::TYPE_TUPLE:
case PycObject::TYPE_SMALL_TUPLE:
{
iprintf(indent, "(\n");
PycTuple::value_t values = obj.cast<PycTuple>()->values();