Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-27 15:10:53 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix type confusion in pyc ##arch

Browse Source
This commit is contained in:
Dennis Goodlett 2024-03-05 17:07:15 -05:00 committed by GitHub
parent 9f19662d57
commit 230a11361c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libr/arch/p/pyc/pyc_dis.c
View File

@ -5,7 +5,7 @@
#define CMP_OP_SIZE 12
static const char *cmp_op[CMP_OP_SIZE] = { "<", "<=", "==", "!=", ">", ">=", "in", "not in", "is", "is not", "exception match", "BAD" };
static char *parse_arg(pyc_opcode_object *op, ut32 oparg, RList *names, RList *consts, RList *varnames, RList *interned_table, RList *freevars, RList *cellvars, RList *opcode_arg_fmt);
static char *parse_arg(pyc_opcode_object *op, ut32 oparg, pyc_code_object *cobj, RList *interned_table, RList *opcode_arg_fmt);
int r_pyc_disasm(RAnalOp *opstruct, const ut8 *code, RList *cobjs, RList *interned_table, ut64 pc, pyc_opcodes *ops) {
pyc_code_object *cobj = NULL, *t = NULL;
@ -40,12 +40,6 @@ int r_pyc_disasm(RAnalOp *opstruct, const ut8 *code, RList *cobjs, RList *intern
opstruct->mnemonic = name;
/* TODO: adding line number and offset */
RList *varnames = R_UNWRAP3 (cobj, varnames, data);
RList *consts = R_UNWRAP3 (cobj, consts, data);
RList *names = R_UNWRAP3 (cobj, names, data);
RList *freevars = R_UNWRAP3 (cobj, freevars, data);
RList *cellvars = R_UNWRAP3 (cobj, cellvars, data);
if (op >= ops->have_argument) {
if (ops->bits == 16) {
oparg = code[i] + code[i + 1] * 256 + extended_arg;
@ -62,9 +56,7 @@ int r_pyc_disasm(RAnalOp *opstruct, const ut8 *code, RList *cobjs, RList *intern
extended_arg = oparg << 8;
}
}
char *arg = parse_arg (&ops->opcodes[op], oparg, names,
consts, varnames, interned_table, freevars, cellvars,
ops->opcode_arg_fmt);
char *arg = parse_arg (&ops->opcodes[op], oparg, cobj, interned_table, ops->opcode_arg_fmt);
if (arg) {
char *nm = r_str_newf ("%s %s", opstruct->mnemonic, arg);
free (opstruct->mnemonic);
@ -77,15 +69,41 @@ int r_pyc_disasm(RAnalOp *opstruct, const ut8 *code, RList *cobjs, RList *intern
return i;
}
static RList *list_from_pycobj(pyc_object *obj) {
if (obj) {
switch (obj->type) {
case TYPE_DICT:
case TYPE_FROZENSET:
case TYPE_SET:
case TYPE_LIST:
case TYPE_TUPLE:
case TYPE_SMALL_TUPLE:
return obj->data;
// TYPE_REF = 'r', // not sure????
default:
break;
}
}
return NULL;
}
static char *generic_array_obj_tostring(RList *l);
static char *parse_arg(pyc_opcode_object *op, ut32 oparg, RList *names, RList *consts, RList *varnames, RList *interned_table, RList *freevars, RList *cellvars, RList *opcode_arg_fmt) {
static char *parse_arg(pyc_opcode_object *op, ut32 oparg, pyc_code_object *cobj, RList *interned_table, RList *opcode_arg_fmt) {
pyc_object *t = NULL;
char *arg = NULL;
pyc_code_object *tmp_cobj;
pyc_arg_fmt *fmt;
RListIter *i = NULL;
// TODO: don't traverse if you are not going to use
// Also, this should probably be more stringent on the allowed types
RList *varnames = list_from_pycobj (R_UNWRAP2 (cobj, varnames));
RList *consts = list_from_pycobj (R_UNWRAP2 (cobj, consts));
RList *names = list_from_pycobj (R_UNWRAP2 (cobj, names));
RList *freevars = list_from_pycobj (R_UNWRAP2 (cobj, freevars));
RList *cellvars = list_from_pycobj (R_UNWRAP2 (cobj, cellvars));
// version-specific formatter for certain opcodes
r_list_foreach (opcode_arg_fmt, i, fmt)
if (!strcmp (fmt->op_name, op->op_name)) {

2
libr/bin/format/pyc/marshal.c
View File

@ -1083,7 +1083,7 @@ static pyc_object *get_object(RBuffer *buffer, int wanted_type) {
break;
case TYPE_STOPITER:
case TYPE_ELLIPSIS:
ret = R_NEW0 (pyc_object);
ret = R_NEW0 (pyc_object); // XXX: type is not set proper?
break;
case TYPE_UNKNOWN:
R_LOG_DEBUG ("Get not implemented for type 0x%x", type);