summaryrefslogtreecommitdiff
path: root/src/format
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2017-05-08 08:01:03 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2017-05-08 08:01:03 (GMT)
commit9a548294c18ae04ef00ee0227ada8eb8b050b5fa (patch)
treec8651fc1fb70579a5bd3f3a61ba04f13ae58efb5 /src/format
parent13be5aa2ac44f7bfc70ee25e7ba20ae2adf58ad5 (diff)
Ensured a Dex routine is not abstract nor native before adding a symbol into the disassembled code.
Diffstat (limited to 'src/format')
-rw-r--r--src/format/dex/class.c30
-rw-r--r--src/format/dex/method.c19
-rw-r--r--src/format/dex/method.h3
3 files changed, 40 insertions, 12 deletions
diff --git a/src/format/dex/class.c b/src/format/dex/class.c
index 3822546..897720a 100644
--- a/src/format/dex/class.c
+++ b/src/format/dex/class.c
@@ -248,16 +248,19 @@ GDexClass *g_dex_class_new(GDexFormat *format, const class_def_item *def)
result->direct_methods[i] = method;
/* Ajout à la liste des symboles */
+ if (g_dex_method_has_dex_body(method))
+ {
+ routine = g_dex_method_get_routine(method);
- routine = g_dex_method_get_routine(method);
+ g_object_ref(G_OBJECT(ctype));
+ g_binary_routine_set_namespace(routine, ctype, ".");
- g_object_ref(G_OBJECT(ctype));
- g_binary_routine_set_namespace(routine, ctype, ".");
+ symbol = g_binary_symbol_new(STP_ROUTINE);
+ g_binary_symbol_attach_routine(symbol, routine);
- symbol = g_binary_symbol_new(STP_ROUTINE);
- g_binary_symbol_attach_routine(symbol, routine);
+ g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol);
- g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol);
+ }
}
@@ -274,16 +277,19 @@ GDexClass *g_dex_class_new(GDexFormat *format, const class_def_item *def)
result->virtual_methods[i] = method;
/* Ajout à la liste des symboles */
+ if (g_dex_method_has_dex_body(method))
+ {
+ routine = g_dex_method_get_routine(method);
- routine = g_dex_method_get_routine(method);
+ g_object_ref(G_OBJECT(ctype));
+ g_binary_routine_set_namespace(routine, ctype, ".");
- g_object_ref(G_OBJECT(ctype));
- g_binary_routine_set_namespace(routine, ctype, ".");
+ symbol = g_binary_symbol_new(STP_ROUTINE);
+ g_binary_symbol_attach_routine(symbol, routine);
- symbol = g_binary_symbol_new(STP_ROUTINE);
- g_binary_symbol_attach_routine(symbol, routine);
+ g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol);
- g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol);
+ }
}
diff --git a/src/format/dex/method.c b/src/format/dex/method.c
index c803bd0..be99479 100644
--- a/src/format/dex/method.c
+++ b/src/format/dex/method.c
@@ -294,6 +294,25 @@ const encoded_method *g_dex_method_get_dex_info(const GDexMethod *method)
* *
* Paramètres : method = représentation interne de la méthode à consulter. *
* *
+* Description : Indique si du code est rattaché à une méthode Dex. *
+* *
+* Retour : true si la méthode n'est pas abstraite ni native. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+bool g_dex_method_has_dex_body(const GDexMethod *method)
+{
+ return method->has_body;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : method = représentation interne de la méthode à consulter. *
+* *
* Description : Fournit les indications Dex relatives au corps de la méthode.*
* *
* Retour : Données brutes du binaire. *
diff --git a/src/format/dex/method.h b/src/format/dex/method.h
index cb1f6e2..e5b8634 100644
--- a/src/format/dex/method.h
+++ b/src/format/dex/method.h
@@ -75,6 +75,9 @@ GDexMethod *g_dex_method_new_callable(GDexFormat *, const method_id_item *);
/* Fournit les indications Dex concernant la méthode. */
const encoded_method *g_dex_method_get_dex_info(const GDexMethod *);
+/* Indique si du code est rattaché à une méthode Dex. */
+bool g_dex_method_has_dex_body(const GDexMethod *);
+
/* Fournit les indications Dex relatives au corps de la méthode. */
const code_item *g_dex_method_get_dex_body(const GDexMethod *);