mirror/rea
1
0
Fork 0
mirror of https://github.com/morluto/rea synced 2026-10-27 06:33:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(python): align pyc and PYZ marshal decoding

Browse Source 
Fixes #6560
Fixes #6559
This commit is contained in:
morluto
2026-10-23 17:16:01 +08:00
parent 667f73aa54
commit fa56001f18
7 changed files with 224 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/python/PythonPycParser.ts
+15 -5
View File
@@ -45,6 +45,14 @@ const TYPE_ASCII_INTERNED = 0x41;
const TYPE_SMALL_TUPLE = 0x29;
const TYPE_SHORT_ASCII = 0x7a;
const TYPE_SHORT_ASCII_INTERNED = 0x5a;
const TYPES_WITHOUT_REFERENCE_SLOTS = new Set([
TYPE_NULL,
TYPE_NONE,
TYPE_FALSE,
TYPE_TRUE,
TYPE_STOPITER,
TYPE_ELLIPSIS,
]);
/** CPython `CO_VARARGS` / `CO_VARKEYWORDS`. Each consumes one local name. */
const CO_VARARGS = 0x04;
const CO_VARKEYWORDS = 0x08;
@@ -309,11 +317,13 @@ class MarshalReader {
const raw = this.u8();
const flagged = (raw & FLAG_REF) !== 0;
const type = raw & ~FLAG_REF;
if (type === TYPE_REF) {
if (flagged) malformed("TYPE_REF must not also set FLAG_REF.");
return this.readRef();
}
const slot = flagged ? this.#intern.length : undefined;
// CPython masks FLAG_REF before dispatch; TYPE_REF returns its existing
// slot directly, and singleton tags bypass reference registration.
if (type === TYPE_REF) return this.readRef();
const slot =
flagged && !TYPES_WITHOUT_REFERENCE_SLOTS.has(type)
? this.#intern.length
: undefined;
if (slot !== undefined) this.#intern.push(undefined);
const value = this.readTyped(type, depth, slot);
if (slot !== undefined && this.#intern[slot] === undefined)