diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2016-09-11 18:29:09 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2016-09-11 18:29:09 (GMT) |
commit | 29f3cf8c660c5ce51dbcdbd0c770a1d9831cf1a8 (patch) | |
tree | 49257065715c40b1af42c0dcd536fb85acc45a1c /src/format/dex/class.c | |
parent | 49f75f22fe67ac356f05c7f81d3a78c48461655b (diff) |
Handled Dex classes used as marker interfaces and Dex virtual methods.
Diffstat (limited to 'src/format/dex/class.c')
-rw-r--r-- | src/format/dex/class.c | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/src/format/dex/class.c b/src/format/dex/class.c index 37fdd04..a88f3f2 100644 --- a/src/format/dex/class.c +++ b/src/format/dex/class.c @@ -39,6 +39,7 @@ struct _GDexClass GObject parent; /* A laisser en premier */ class_def_item definition; /* Définition de la classe */ + bool has_data; /* Indicateur de présence */ class_data_item data; /* Contenu de la classe */ GDexMethod **direct_methods; /* Méthodes propres */ @@ -199,14 +200,29 @@ GDexClass *g_dex_class_new(GDexFormat *format, const class_def_item *def) GBinRoutine *routine; /* Version interne de méthode */ GBinSymbol *symbol; /* Nouveau symbole construit */ + result = g_object_new(G_TYPE_DEX_CLASS, NULL); + + result->definition = *def; + result->has_data = (def->class_data_off != 0); + + /* Interface vide ? */ + if (!result->has_data) + { + result->dmethods_count = 0; + result->direct_methods = NULL; + + result->vmethods_count = 0; + result->virtual_methods = NULL; + + goto gdcn_done; + + } + init_vmpa(&addr, def->class_data_off, VMPA_NO_VIRTUAL); if (!read_dex_class_data_item(format, &addr, &data)) - return NULL; + goto gdcn_bad_item; - result = g_object_new(G_TYPE_DEX_CLASS, NULL); - - result->definition = *def; result->data = data; /** @@ -264,6 +280,7 @@ GDexClass *g_dex_class_new(GDexFormat *format, const class_def_item *def) return result; + gdcn_bad_item: gdcn_bad_method: g_object_unref(G_OBJECT(result)); @@ -306,7 +323,7 @@ const class_def_item *g_dex_class_get_definition(const GDexClass *class) const class_data_item *g_dex_class_get_data(const GDexClass *class) { - return &class->data; + return (class->has_data ? &class->data : NULL); } @@ -410,9 +427,20 @@ GDexMethod *g_dex_class_find_method_by_address(const GDexClass *class, vmpa_t ad { GDexMethod *result; /* Trouvaille à retourner */ size_t i; /* Boucle de parcours */ + phys_t offset; /* Emplacement de méthode */ result = NULL; +#if 0 /* FIXME */ + /* + +bool g_dex_method_get_offset(const GDexMethod *method, phys_t *offset) + + if (!g_exe_format_translate_offset_into_vmpa(G_EXE_FORMAT(format), method->offset, &addr)) + return; + + */ + for (i = 0; i < class->dmethods_count && result == NULL; i++) if (addr == (vmpa_t)g_dex_method_get_offset(class->direct_methods[i])) result = class->direct_methods[i]; @@ -420,6 +448,7 @@ GDexMethod *g_dex_class_find_method_by_address(const GDexClass *class, vmpa_t ad for (i = 0; i < class->vmethods_count && result == NULL; i++) if (addr == (vmpa_t)g_dex_method_get_offset(class->virtual_methods[i])) result = class->virtual_methods[i]; +#endif return result; |