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

Fix bytecode compatibility with Python 3.7 beta3

Browse Source
This commit is contained in:
Michael Hansen
2018-04-26 14:31:21 -07:00
parent bf60a5831b
commit 0c3955883f
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PythonBytecode.txt
View File

@@ -7,7 +7,7 @@ Python MAGIC Python MAGIC Python MAGIC
1.5 0x0A0D4E99 2.5 0x0A0DF2B3 3.5 0x0A0D0D16
1.6 0x0A0DC4FC 2.6 0x0A0DF2D1 3.5.3 0x0A0D0D17
2.7 0x0A0DF303 3.6 0x0A0D0D33
3.7 0x0A0D0D3F
3.7 0x0A0D0D41
1.0 1.1 1.2 1.3 1.4 1.5 1.6
@@ -479,7 +479,7 @@ SETUP_FINALLY [X] [X] [X] [X] [X] [X] [X]
LOAD_FAST [X] [X] [X] [X] [X] [X] [X] [X]
STORE_FAST [X] [X] [X] [X] [X] [X] [X] [X]
DELETE_FAST [X] [X] [X] [X] [X] [X] [X] [X]
STORE_ANNOTATION [ ] [ ] [ ] [ ] [ ] [ ] [X] [X]
STORE_ANNOTATION [ ] [ ] [ ] [ ] [ ] [ ] [X] [ ]
<128> [ ] [ ] [ ] [ ] [ ] [ ] [ ] [ ]
<129> [ ] [ ] [ ] [ ] [ ] [ ] [ ] [ ]
RAISE_VARARGS [X] [X] [X] [X] [X] [X] [X] [X]

1
bytes/python_37.map
View File

@@ -89,7 +89,6 @@
124 LOAD_FAST_A
125 STORE_FAST_A
126 DELETE_FAST_A
127 STORE_ANNOTATION_A
130 RAISE_VARARGS_A
131 CALL_FUNCTION_A
132 MAKE_FUNCTION_A

17
pyc_module.cpp
View File

@@ -165,10 +165,21 @@ void PycModule::loadFromFile(const char* filename)
fputs("Bad MAGIC!\n", stderr);
return;
}
in.get32(); // Timestamp -- who cares?
if (verCompare(3, 3) >= 0)
in.get32(); // Size parameter added in Python 3.3
int flags = 0;
if (verCompare(3, 7) >= 0)
flags = in.get32();
if (flags & 0x1) {
// Optional checksum added in Python 3.7
in.get32();
in.get32();
} else {
in.get32(); // Timestamp -- who cares?
if (verCompare(3, 3) >= 0)
in.get32(); // Size parameter added in Python 3.3
}
m_code = LoadObject(&in, this).require_cast<PycCode>();
}

2
pyc_module.h
View File

@@ -29,7 +29,7 @@ enum PycMagic {
MAGIC_3_5 = 0x0A0D0D16,
MAGIC_3_5_3 = 0x0A0D0D17,
MAGIC_3_6 = 0x0A0D0D33,
MAGIC_3_7 = 0x0A0D0D3F,
MAGIC_3_7 = 0x0A0D0D41,
};
#define PYC_VERSION(maj, min) MAGIC_##maj##_##min